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
   No newline at end of file
             class AntennaUpInline(admin.StackedInline):
                 model = AntennaUp
   No newline at end of file
             class AntennaDownInline(admin.StackedInline):
                 model = AntennaDown
   No newline at end of file
             class PatternAdmin(admin.ModelAdmin):
                 fieldsets = [
                     (None,               {'fields': ['value']}),
                     ('Date information', {'fields': ['date_create', 'date_modified'], 'classes': ['collapse']}),
                 ]
                 inlines = [AntennaUpInline]
                 inlines = [AntennaDownInline]
   No newline at end of file
             class PatternInline(admin.StackedInline):
                 model = Pattern
                 readonly_fields = ['date_create', 'date_modified', 'hits']
   No newline at end of file
                 fieldsets = [
                     (None,               {'fields': ['value']}),
                     ('Date information', {'fields': [('date_create', 'date_modified')], 'classes': ['collapse']}),
                     ('State',            {'fields': ['hits', 'state'], 'classes': ['collapse', 'wide', 'extrapretty']}),
                 ]
                 extra = 0
   No newline at end of file
             class ProfileAdmin(admin.ModelAdmin):
+                list_display = ('name', 'date_create','hits','state')
              No newline at end of file
+                list_filter = ['state','date_create','date_modified']
              No newline at end of file
+                date_hierarchy = 'date_create'
  No newline at end of file
                 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]
   No newline at end of file
   No newline at end of file
             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
   No newline at end of file
             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'),
  No newline at end of file
                 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
   No newline at end of file
             from datetime import datetime
   No newline at end of file
             from abscontrol.models import Profile, Pattern, AntennaDown, AntennaUp
   No newline at end of file
             from util.readABSFile import readABSFile
             from util.saveABSFile import saveABSFile
             from scripts.sendFile import sendFile
   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.filter(state=1)
                 return render_to_response('abscontrol/index.html', {'profile_list': profile_list})
   No newline at end of file
             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()
   No newline at end of file
                 lsPatterns = None
   No newline at end of file
                 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),
                                                                   })
   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
              No newline at end of file
+            # Update temporal experiment
              No newline at end of file
+            def upgrade(request, profile_id):
              No newline at end of file
+                txtAntennaUp = request.POST["txtAntennaUp"]
              No newline at end of file
+                txtTxUp = request.POST["txtTxUp"]
              No newline at end of file
+                txtRxUp = request.POST["txtRxUp"]
              No newline at end of file
+                txtUesUp = request.POST["txtUesUp"]
              No newline at end of file
              No newline at end of file
+                txtAntennaDown = request.POST["txtAntennaDown"]
              No newline at end of file
+                txtTxDown = request.POST["txtTxDown"]
              No newline at end of file
+                txtRxDown = request.POST["txtRxDown"]
              No newline at end of file
+                txtUesDown = request.POST["txtUesDown"]
              No newline at end of file
              No newline at end of file
+                objProfile = Profile.objects.get(pk=profile_id)
              No newline at end of file
+                newpattern = objProfile.pattern_set.create(value=1)
              No newline at end of file
+                newpattern.antennaup_set.create(value=txtAntennaUp,tx=txtTxUp,rx=txtRxUp,ues=txtUesUp)
              No newline at end of file
+                newpattern.antennadown_set.create(value=txtAntennaDown,tx=txtTxDown,rx=txtRxDown,ues=txtUesDown)
              No newline at end of file
              No newline at end of file
+                newurl = '/abscontrol/%d/edit/%d' % (int(profile_id), newpattern.id)
  No newline at end of file
                 return redirect(newurl)
   No newline at end of file
             def update(request, profile_id):
                 txtProfile = request.POST["txtProfile"]
   No newline at end of file
                 objProfile = Profile.objects.get(pk=profile_id)
                 objProfile.name = txtProfile
                 objProfile.state = 1
                 objProfile.save()
   No newline at end of file
                 newurl = '/abscontrol/view/%d' % objProfile.id
                 return redirect(newurl)
   No newline at end of file
             def changeName(request, profile_id):
                 profile_list = Profile.objects.filter(state=1)
                 objProfile = Profile.objects.get(pk=profile_id)
                 lsPatterns = objProfile.pattern_set.all()
   No newline at end of file
                 return render_to_response('abscontrol/changeName.html', {'profile_list': profile_list,
                                                                          'objProfile': objProfile,
                                                                          'lsPatterns' : lsPatterns,
                                                                          })
   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.filter(state=1)
                 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.filter(state=1)
                 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.filter(state=1)
                 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.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()
   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
                 method = "save"
   No newline at end of file
                 if 'pattern_id' in request.POST:
                     pattern_id = request.POST["pattern_id"]
                     method = "update"
   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
                 mode = request.POST["mode"]
   No newline at end of file
                 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
   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)
                         error = 0
                     else:
                         error = 1 # Can not add more patterns
   No newline at end of file
                     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()
   No newline at end of file
                     txtAntennaDownId = request.POST["txtAntennaDownId"]
                     objAntennaDown = AntennaDown.objects.get(pk=txtAntennaDownId)
                     objAntennaDown.value = txtAntennaDown
                     objAntennaDown.tx = txtTxDown
                     objAntennaDown.rx = txtRxDown
                     objAntennaDown.ues = txtUesDown
                     objAntennaDown.save()
   No newline at end of file
                     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))
   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.filter(state=1)
                 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)
   No newline at end of file
             def importProfile(request):
                 profile_list = Profile.objects.filter(state=1)
                 return render_to_response('abscontrol/import.html', {'profile_list': profile_list,})
   No newline at end of file
             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()
   No newline at end of file
                         if expName != "" and num_patterns > 0:
                             newprofile = Profile(name=expName)
                             newprofile.save()
                             newprofile.state = 1
   No newline at end of file
                             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"])
   No newline at end of file
                             newprofile.save()
   No newline at end of file
                             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."
   No newline at end of file
                     return render_to_response('abscontrol/error.html', {'profile_list': profile_list, 'txtError' : txtError, })
   No newline at end of file
             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
   No newline at end of file
                 phase_tx = objAntenna.value
                 gain_tx = objAntenna.tx
                 gain_rx = objAntenna.rx
                 ues_tx = objAntenna.ues
                 only_rx = objAntenna.only_rx
   No newline at end of file
                 return exp_name, phase_tx, gain_tx, gain_rx, ues_tx, only_rx
   No newline at end of file
             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)
   No newline at end of file
                 absFile = saveABSFile()
                 absFile.setParameters(settings.MEDIA_ROOT, exp_name, listPatterns)
                 filename, filesize = absFile.save()
   No newline at end of file
                 wrapper = FileWrapper( open( filename, "r" ) )
                 content_type = mimetypes.guess_type( filename )[0]
   No newline at end of file
                 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)
   No newline at end of file
                 return response
   No newline at end of file
             def send(request, profile_id):
                 listPatterns = []
                 objProfile = Profile.objects.get(pk=profile_id)
                 exp_name = objProfile.name
   No newline at end of file
                 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)
   No newline at end of file
                 absFile = saveABSFile()
                 absFile.setParameters(settings.MEDIA_ROOT, exp_name, listPatterns)
                 filename, filesize = absFile.save()
   No newline at end of file
                 apiclient = sendFile()
                 apiclient.execute(filename)
                 output = apiclient.getOutput()
   No newline at end of file
                 if output == "OK":
                     message = "File sent successfully."
                     objProfile.hits += 1
                     objProfile.save()
                 else:
                     message = "Error sending file."
   No newline at end of file
                 profile_list = Profile.objects.all()
   No newline at end of file
                 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;
              */
   No newline at end of file
             body {
             	padding: 0;
             	margin: 0;
             	font-size: 12px; }
   No newline at end of file
             header {
             	width: 980px;
             	height: 50px;
             	text-align: center;
             	line-height: 50px;
             	border: 0px solid #fcc !important; }
   No newline at end of file
             #schema {
             	margin: 0 auto;
             	width: 980px;
             	padding: 10px 10px;
             	border: 0px solid #f00 !important; }
   No newline at end of file
             #content {
             	margin: 5px 0px;
             	border: 0px solid #1cc; }
   No newline at end of file
             #topcolumn {
             	float: left;
             	width: 980px;
             	height: 40px;
             	line-height: 35px;
             	margin: 2px 0px;
             	border: 1px solid #ddd !important;
             	box-shadow: 2px 2px 5px #888; }
   No newline at end of file
             #maincolumn {
             	float: left;
             	width: 980px;
             	margin: 2px 0px;
             	padding: 0px 0px;
             	border: 1px solid #ddd !important;
             	box-shadow: 2px 2px 5px #666; }
   No newline at end of file
             footer {
             	height: 30px;
             	line-height: 30px;
             	text-align: center;
             	margin: 0px 0px;
             	border: 0px solid #200 !important;
             	box-shadow: 2px 2px 5px #888; }
   No newline at end of file
             .cleardivs {
             	clear: both;
             	border: 0px solid #400;
             	height: 0px; }
   No newline at end of file
             textarea {
             	resize: none;
             	overflow: hidden; }
   No newline at end of file
             /****************************************************************************************/
             /******                     ESTILOS GENERALES                           *****************/
             /****************************************************************************************/
             .mnu {
             	height: 22px;
             	border: 0px solid #c55 !important; }
   No newline at end of file
             .mnu li {
             	display:inline; }
   No newline at end of file
             .MnuVertical, .MnuHorizontal {
             	font-family: 'Droid Sans', sans-serif;
             	font-size: inherit;
             	font-style: normal;
             	text-shadow: 2px 2px #eee; }
   No newline at end of file
             .MnuHorizontal ul {
             	list-style: none;
             	list-style-type: none;
             	margin: 0; }
   No newline at end of file
             /*.MnuHorizontal{
             	display: -webkit-box;
             	-webkit-box-orient:horizontal; }
   No newline at end of file
             .MnuHorizontal a{
             	display:block;
             	padding:10px;
             	-webkit-box-flex:1;
             	text-align:center; }*/
   No newline at end of file
             /****************************************************************************************/
             /******                 MENU DE NAVEGACION DE PERFILES 						*************/
             /****************************************************************************************/
             #infoProfiles {
             	float: left;
             	width: 300px;
             	margin: 0px;
             	padding: 2px 0px;
             	border: 0px solid #1cc !important; }
   No newline at end of file
             #infoProfiles label {
             	padding: 10px 10px 10px 12px;
             	margin: 10px 0; }
   No newline at end of file
             #infoProfiles select {
             	padding: 4px 0px; margin: 0;
             	font-family: 'Droid Sans', sans-serif;
             	font-size: 12px;
             	letter-spacing: 0.029em;
             	width: 200px; }
   No newline at end of file
             #mnuProfiles {
             	margin: 0;
             	float: right;
             	padding: 2px 10px;
             	border: 0px solid #1494F6 !important; }
   No newline at end of file
             #mnuProfiles ul {
             	list-style: none;
             	list-style-type: none;
             	margin: 0;
             	padding-left: 20px;
             	border: 0px solid #f00 !important; }
   No newline at end of file
             #mnuProfiles li {
             	width: 80px;
             	float: left;
             	padding: 2px;
             	border: 0px solid #c55 !important; }
   No newline at end of file
             #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; }
   No newline at end of file
             /****************************************************************************************/
             /********               FORMULARIO DE PERFILES      *************************************/
             /****************************************************************************************/
             #divProfile {
             	margin: 10px 0px;
             	padding: 10px 10px;
             	width: 500px;
             	border: 0px solid #dff !important; }
   No newline at end of file
             #divPattern textarea,input[type=text],label,input[type=file],input[type=button],input[type=submit] {
             	font-family: 'Open Sans', sans-serif;
             	font-size: inherit; }
   No newline at end of file
             .antenna, .NewAntenna {
             	box-shadow: 1px 1px 2px #666;
             	padding: 5px;
             	margin: 10px auto;
             	width: 520px;
             	display: block;
             	border: 0px solid #fee !important; }
   No newline at end of file
             .antenna {
             	width: 520px; }
   No newline at end of file
             .NewAntenna {
             	width: 620px; }
   No newline at end of file
             .flsAntenna, .NewFlsAntenna {
             	margin: 0;
             	padding: 0px;
             	border: 1px solid #fee !important;
             	width: 510px; }
   No newline at end of file
             .flsAntenna {
             	width: 510px; }
   No newline at end of file
             .NewFlsAntenna {
             	width: 610px; }
   No newline at end of file
             .legendAntenna {
             	font-family: 'Roboto Condensed', sans-serif;
             	font-size: inherit;
             	text-align: center;
             	margin-left: 10px; }
   No newline at end of file
             .infoAntenna {
             	width: 500px;
  No newline at end of file
-            	width: 480px;
  No newline at end of file
             	float: left;
             	border: 0px solid #f00 !important; }
   No newline at end of file
             .overJRO {
             	width: 250px;
             	float: left;
             	margin: 0px 5px;
             	border: 0px solid #1cc !important; }
   No newline at end of file
             .divAntenna {
             	width: 220px;
             	float: left;
             	margin: 10px;
             	border: 0px solid #fcc !important; }
   No newline at end of file
             .NewDivAntenna {
             	width: 290px;
             	float: left;
             	margin: 10px;
             	border: 0px solid #fcc !important; }
   No newline at end of file
             .titleField {
             	display: block;
             	text-align: center; }
   No newline at end of file
             .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; }
   No newline at end of file
             .txtAntenna {
             	padding: 4px;
             }
   No newline at end of file
             .view-textAntenna {
             	padding: 2px;
             	font-family: "Ubuntu";
             	font-size: inherit; }
   No newline at end of file
             .boxAntenna {
             	width: 280px;
             	border: 2px solid #eee !important;
             	text-align: center;
             	display: block;
             	float: left;
             	margin: 0;
             	padding: 0; }
   No newline at end of file
             .lineInputs {
             	width: 262px;
             	text-align: center;
             	line-height: 18px;
             	padding: 0;
             	height: 20px;
             	margin: 0 auto;
             	display: block;
             	border: 0px solid #1cc !important; }
   No newline at end of file
             .lineInputs label {
             	float: left;
             	margin: 0px 2px;
             	border: 0px solid #bbb !important; }
   No newline at end of file
             .divValuesAntenna {
             	width: 230px;
             	border: 0px solid #bbb !important;
             	float: left;
             	display: block;
             	margin: 0 auto; }
   No newline at end of file
             .divValuesAntenna input[type=text] {
             	width: 18px;
             	border: 0px;
             	border-bottom: 1px solid #666 !important;
             	line-height: 20px; }
   No newline at end of file
             .lblSign {
             	width: 8px;
             	font-family: 'Roboto Condensed', sans-serif;
             	font-size: 1.1em;
             	color: #666; }
   No newline at end of file
             #lblSignLeft, #lblSignRight {
             	margin: 0;
             	line-height: 18px;
             	height: 20px;
             	float: left;
             	padding: 0; }
   No newline at end of file
             .divTx {
             	display: block;
             	float: left;
             	margin: 10px;
             	border: 0px solid #f00 !important; }
   No newline at end of file
             .divTx label {
             	display: block; }
   No newline at end of file
             .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; }
   No newline at end of file
             .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; }
   No newline at end of file
             .divUes {
             	display: block;
             	margin: 10px; }
   No newline at end of file
             .divUes input[type=text] {
             	width: 240px;
             	max-width: 240px;
             	font-family: 'Ubuntu', sans-serif;
             	font-size: inherit; }
   No newline at end of file
             .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; }
   No newline at end of file
             .overJRO a {
             	text-align: center;
             	margin: 0 auto;
             	display: block; }
   No newline at end of file
             /****************************************************************************************/
             /******                 MENU DE NAVEGACION DE PATRONES **********************************/
             /****************************************************************************************/
             #divMnuPattern {
             	width: 280px;
             	height: 25px;
             	display: block;
             	float: right;
             	margin: 5px 40px 5px 0px;
             	border: 0px solid #1cc !important; }
   No newline at end of file
             #divMnuPattern li {
             	float: right;
             	display: block;
             	width: 60px;
             	border: 0px solid #2cc !important; }
   No newline at end of file
             #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; }
   No newline at end of file
             #infoPattern {
             	display: block;
             	margin: 0px 25px;
             	border: 0px solid #1494f6 !important; }
   No newline at end of file
             #navPatterns {
             	margin: 0 auto;
             	width: 700px;
             	height: 30px;
             	border: 0px solid #d00 !important;
             	font-family: 'Ubuntu', sans-serif;
             	font-size: 14px;
             	padding: 5px 0px; }
   No newline at end of file
             #navPatternList {
             	margin: 0 auto;
             	border: 0px solid #ecc !important; }
   No newline at end of file
             #navPatternList ul {
             	list-style: none;
             	list-style-type: none;
             	margin: 0; }
   No newline at end of file
             #navPatternList ul li {
             	float: left;
             	width: 50px;
             	border: 1px solid #eee !important; }
   No newline at end of file
             #navPatternList a {
             	width: 50px;
             	display: block;
             	text-align: center;
             	line-height: 30px;
             	padding: 1px 0px;
             	border: 0px solid #1cc !important; }
   No newline at end of file
             .lnkPattern {
             	background-color: #ccc !important;
             	color: #eee; }
   No newline at end of file
             .lnkPatternSelected {
             	background-color: #2cc !important;
             	color: #fff; }
   No newline at end of file
             .divListofPatterns {
             	width: 650px;
             	display: block;
             	border: 1px solid #1cc !important;
             	margin: 0 auto; }
   No newline at end of file
             .divPattern {
             	width: 600px;
             	display: block;
             	border: 1px solid #f00 !important;
             	margin: 2px auto; }
   No newline at end of file
             /****************************************************************************************/
             /******                 			HEADER 									*************/
             /****************************************************************************************/
             header nav {
             	width: 960px;
             	margin: 0 auto;
             	height: 100%;
             	border: 0px solid #1cc !important; }
   No newline at end of file
             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; }
   No newline at end of file
             header nav a.selected {
             	background: #666;
             	color: #fff; }
   No newline at end of file
             /****************************************************************************************/
             /******                 			FOOTER 									*************/
             /****************************************************************************************/
             footer p {
             	font-family: 'Roboto Condensed', sans-serif;
             	font-size: 0.98em; }

trunk/webapp/static/js/patterns.js +35 0

             /**
              * @author Jose Antonio Sal y Rosas Celi
              * @contact: jose.salyrosas@jro.igp.gob.pe, arturo.jasyrc@gmail.com
              */
   No newline at end of file
             $(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();
              No newline at end of file
+                 });
              No newline at end of file
+                $('#lnkSavePattern').click(function() {
              No newline at end of file
+                	valueAntennaUp = "";
              No newline at end of file
+                	valueAntennaDown = "";
              No newline at end of file
+                	for(i=0; i<=7; i++){
              No newline at end of file
+                		if(i == 0){
              No newline at end of file
+                			valueAntennaUp += "[";
              No newline at end of file
+                			valueAntennaDown += "[";
              No newline at end of file
+            			}else{
              No newline at end of file
+            				valueAntennaUp += ",";
              No newline at end of file
+            				valueAntennaDown += ",";
              No newline at end of file
+            			}
              No newline at end of file
+                		for(j=0; j<=7; j++){
              No newline at end of file
+                			if(j == 0){
              No newline at end of file
+                				valueAntennaUp += "[";
              No newline at end of file
+                				valueAntennaDown += "[";
              No newline at end of file
+                			}
              No newline at end of file
+                			valueAntennaUp += $("input[id=txtUnitAntennaUp_"+i+"_"+j+"]").val();
              No newline at end of file
+                			valueAntennaDown += $("input[id=txtUnitAntennaDown_"+i+"_"+j+"]").val();
              No newline at end of file
+                			if(j != 7){
              No newline at end of file
+                				valueAntennaUp += ",";
              No newline at end of file
+                				valueAntennaDown += ",";
              No newline at end of file
+                			}else{
              No newline at end of file
+                				valueAntennaUp += "]";
              No newline at end of file
+                				valueAntennaDown += "]";
              No newline at end of file
+                			}
              No newline at end of file
+                		}
              No newline at end of file
+                		if(i == 7){
              No newline at end of file
+                			valueAntennaUp += "]";
              No newline at end of file
+                			valueAntennaDown += "]";
              No newline at end of file
+            			}
              No newline at end of file
+                	}
              No newline at end of file
+                	$('input[name=txtAntennaUp]').attr("value",valueAntennaUp);
              No newline at end of file
+                	$('input[name=txtAntennaDown]').attr("value",valueAntennaDown);
  No newline at end of file
                 	$('#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">
  No newline at end of file
+             No newline at end of file
+                <form action="/abscontrol/upgrade/{{ profile_id }}/" method="post" id="frmPattern">
  No newline at end of file
                 <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="lnkSavePattern">Save</a></li>
  No newline at end of file
-                        	<li><a href="#" id="lnkSave">Save</a></li>
  No newline at end of file
                         </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="txtUnitAntennaUp" class="txtUnitAntenna" id="txtUnitAntennaUp_{{ i }}_{{ j }}" value="0.5" />
  No newline at end of file
-                                			<input type="text" name="txtUnitAntenna" class="txtUnitAntenna" value="0.5" />
  No newline at end of file
                                 			{% 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="" />
  No newline at end of file
                     </div>
   No newline at end of file
                     <div id="antennaDown" class="NewAntenna">
                         <fieldset class="NewFlsAntenna">
                             <legend class="legendAntenna">DOWN</legend>
                             <div class="NewDivAntenna">
-                            <div class="divAntenna">
+             No newline at end of file
                                 <label for="lblAntenna" class="titleField">Antenna</label>
-                                <label for="lblAntenna">Antenna</label>
+             No newline at end of file
                                 <div class="boxAntenna" id="divtxtAntenna">
-                                <textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8">{{ txtAntenna }}</textarea>    
  No newline at end of file
+             No newline at end of file
+                                {% for i in range %}
              No newline at end of file
+                                	<div class="lineInputs">
              No newline at end of file
+                                	{% if i == 0 %}<label for="lblSignLeft" class="lblSign" id="lblSignLeft">[</label>{% endif %}
              No newline at end of file
+                                		<label for="lblSign" class="lblSign">[</label>
              No newline at end of file
+                                		<div class="divValuesAntenna">
              No newline at end of file
+                                		{% for j in range %}
              No newline at end of file
+                                			<input type="text" name="txtUnitAntennaDown" class="txtUnitAntenna" id="txtUnitAntennaDown_{{ i }}_{{ j }}" value="0.5" />
              No newline at end of file
+                                			{% if j != 7 %},{% endif %}
              No newline at end of file
+                                		{% endfor %}
              No newline at end of file
+                                		</div>
              No newline at end of file
+                                		<label for="lblSign" class="lblSign">]</label>
              No newline at end of file
+                                		{% if i == 7 %}<label for="lblSignRight" class="lblSign" id="lblSignRight">]</label>{% endif %}
              No newline at end of file
+                                	</div>
              No newline at end of file
+                                {% endfor %}
              No newline at end of file
+                                </div>  
  No newline at end of file
                             </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="" />
  No newline at end of file
                     </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