ABS/abscontrol Commit - r167:168 · Jicamarca Repository

- Agregada la funcion que permite enviar un archivo a la API cliente de ABS CONTROL.

jsalyrosas -

r167:168

parent child

Context file:

r167:168

Collapse all files

trunk/webapp/templates/abscontrol/sendFile.html created 10644 +10 0

@@ -0,0 +1,10
	1	{% extends "abscontrol/index.html" %}
	2	{% block title %}ABS CONTROL:::::SENDING FILE{% endblock %}
	3
	4	{% block maincolumn %}
	5	<div id="maincolumn">
	6	<div class="divMessage">
	7	<label>{{ message }}</label>
	8	</div>
	9	</div>
	10	{% endblock %} No newline at end of file

trunk/webapp/abs_webapp_dev/settings.py +3 -1

             # Django settings for abs_webapp_dev project.
-            import os
+            import os, sys
             PROJECT_DIR = os.path.split(os.path.dirname(__file__))[0]
+            API_DIR = "/home/dev/workspace/absclient"
+            sys.path.append(API_DIR)
             DEBUG = True
             TEMPLATE_DEBUG = DEBUG
             ADMINS = (
                 # ('Your Name', 'your_email@example.com'),
             )
             MANAGERS = ADMINS
             DATABASES = {
                 'default': {
                     'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
                     'NAME': 'db_jrowebapp_dev',                      # Or path to database file if using sqlite3.
                     'USER': 'abscontrol',                      # Not used with sqlite3.
                     'PASSWORD': 'abscontrol',                  # Not used with sqlite3.
                     'HOST': 'localhost',                      # Set to empty string for localhost. Not used with sqlite3.
                     'PORT': '3306',                      # Set to empty string for default. Not used with sqlite3.
                 }
             }
             # Local time zone for this installation. Choices can be found here:
             # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
             # although not all choices may be available on all operating systems.
             # In a Windows environment this must be set to your system time zone.
             TIME_ZONE = 'America/Lima'
             # Language code for this installation. All choices can be found here:
             # http://www.i18nguy.com/unicode/language-identifiers.html
             LANGUAGE_CODE = 'en-us'
             SITE_ID = 1
             # If you set this to False, Django will make some optimizations so as not
             # to load the internationalization machinery.
             USE_I18N = True
             # If you set this to False, Django will not format dates, numbers and
             # calendars according to the current locale.
             USE_L10N = True
             # If you set this to False, Django will not use timezone-aware datetimes.
             USE_TZ = True
             # Absolute filesystem path to the directory that will hold user-uploaded files.
             # Example: "/home/media/media.lawrence.com/media/"
             MEDIA_ROOT = os.path.join(PROJECT_DIR, 'media').replace('\\', '/')
             # URL that handles the media served from MEDIA_ROOT. Make sure to use a
             # trailing slash.
             # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
             MEDIA_URL = '/media/'
             # Absolute path to the directory static files should be collected to.
             # Don't put anything in this directory yourself; store your static files
             # in apps' "static/" subdirectories and in STATICFILES_DIRS.
             # Example: "/home/media/media.lawrence.com/static/"
             #STATIC_ROOT = os.path.join(PROJECT_DIR, 'static-serve').replace('\\', '/'),
             STATIC_ROOT = ''
             # URL prefix for static files.
             # Example: "http://media.lawrence.com/static/"
             STATIC_URL = '/static/'
             # Additional locations of static files
             STATICFILES_DIRS = (
                 # Put strings here, like "/home/html/static" or "C:/www/django/static".
                 # Always use forward slashes, even on Windows.
                 # Don't forget to use absolute paths, not relative paths.
                 #os.path.join(PROJECT_DIR, "static").replace('\\', '/'),
                 ("static", os.path.join(PROJECT_DIR, "static").replace('\\', '/')),
             )
             # List of finder classes that know how to find static files in
             # various locations.
             STATICFILES_FINDERS = (
                 'django.contrib.staticfiles.finders.FileSystemFinder',
                 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
             #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
             )
             # Make this unique, and don't share it with anybody.
             SECRET_KEY = '=^abu)gd=)7hf#rme_vw=tv!bdh7+tts*^&amp;)h(n=7@7(9#__@e'
             # List of callables that know how to import templates from various sources.
             TEMPLATE_LOADERS = (
                 'django.template.loaders.filesystem.Loader',
                 'django.template.loaders.app_directories.Loader',
             #     'django.template.loaders.eggs.Loader',
             )
             MIDDLEWARE_CLASSES = (
                 'django.middleware.common.CommonMiddleware',
                 'django.contrib.sessions.middleware.SessionMiddleware',
                 #'django.middleware.csrf.CsrfViewMiddleware',
                 'django.contrib.auth.middleware.AuthenticationMiddleware',
                 'django.contrib.messages.middleware.MessageMiddleware',
                 # Uncomment the next line for simple clickjacking protection:
                 # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
             )
             ROOT_URLCONF = 'abs_webapp_dev.urls'
             # Python dotted path to the WSGI application used by Django's runserver.
             WSGI_APPLICATION = 'abs_webapp_dev.wsgi.application'
             TEMPLATE_DIRS = (
                 # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
                 # Always use forward slashes, even on Windows.
                 # Don't forget to use absolute paths, not relative paths.
                 os.path.join(PROJECT_DIR, "templates").replace('\\', '/'),
             )
             INSTALLED_APPS = (
                 'django.contrib.auth',
                 'django.contrib.contenttypes',
                 'django.contrib.sessions',
                 'django.contrib.sites',
                 'django.contrib.messages',
                 'django.contrib.staticfiles',
                 # Uncomment the next line to enable the admin:
                 'django.contrib.admin',
                 # Uncomment the next line to enable admin documentation:
                 # 'django.contrib.admindocs',
                 'abscontrol',
             )
             # A sample logging configuration. The only tangible logging
             # performed by this configuration is to send an email to
             # the site admins on every HTTP 500 error when DEBUG=False.
             # See http://docs.djangoproject.com/en/dev/topics/logging for
             # more details on how to customize your logging configuration.
             LOGGING = {
                 'version': 1,
                 'disable_existing_loggers': False,
                 'filters': {
                     'require_debug_false': {
                         '()': 'django.utils.log.RequireDebugFalse'
                     }
                 },
                 'handlers': {
                     'mail_admins': {
                         'level': 'ERROR',
                         'filters': ['require_debug_false'],
                         'class': 'django.utils.log.AdminEmailHandler'
                     }
                 },
                 'loggers': {
                     'django.request': {
                         'handlers': ['mail_admins'],
                         'level': 'ERROR',
                         'propagate': True,
                     },
                 }
             }

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'^(?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'^showImport/$', 'showImport'),
                 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 +31 -1

             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 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.all()
                 return render_to_response('abscontrol/index.html', {'profile_list': profile_list})
             def new(request):
                 profile_list = Profile.objects.all()
                 return render_to_response('abscontrol/new.html', {'profile_list': profile_list,
                                                                   'txtAntenna' : txtAntenna,
                                                                   'txtUes' : txtUes, 'txtTxUp' : txtTxUp,
                                                                   'txtTxDown' : txtTxDown, 'txtRxUp' : txtRxUp,
                                                                   'txtRxDown' : txtRxDown,
                                                                   })
             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)
             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.all()
                 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.all()
                 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.all()
                 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.all()
                 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"]
                 if method == "save":
                     objProfile = Profile.objects.get(pk=profile_id)
                     lsPatterns = objProfile.pattern_set.all()
                     for element in lsPatterns:
                         if element.value > maxValuePattern:
                             maxPattern = element.value
                     if maxPattern < 10 :
                         newValuePattern = maxPattern + 1
                         newpattern = objProfile.pattern_set.create(value=newValuePattern)
                         newpattern.antennaup_set.create(value=txtAntennaUp,tx=txtTxUp,rx=txtRxUp,ues=txtUesUp)
                         newpattern.antennadown_set.create(value=txtAntennaDown,tx=txtTxDown,rx=txtRxDown,ues=txtUesDown)
                         newurl = '/abscontrol/%d/view/%d' % (int(profile_id), newpattern.id)
                     else:
                         newurl = '/abscontrol/edit/%d' % (int(profile_id))
                 else:
                     txtAntennaUpId = request.POST["txtAntennaUpId"]
                     objAntennaUp = AntennaUp.objects.get(pk=txtAntennaUpId)
                     objAntennaUp.value = txtAntennaUp
                     objAntennaUp.tx = txtTxUp
                     objAntennaUp.rx = txtRxUp
                     objAntennaUp.ues = txtUesUp
                     objAntennaUp.save()
                     txtAntennaDownId = request.POST["txtAntennaDownId"]
                     objAntennaDown = AntennaDown.objects.get(pk=txtAntennaDownId)
                     objAntennaDown.value = txtAntennaDown
                     objAntennaDown.tx = txtTxDown
                     objAntennaDown.rx = txtRxDown
                     objAntennaDown.ues = txtUesDown
                     objAntennaDown.save()
                     newurl = '/abscontrol/%d/view/%d' % (int(profile_id), int(pattern_id))
                 return redirect(newurl)
             def viewPattern(request, profile_id, pattern_id):
                 profile_list = Profile.objects.all()
                 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.all()
                 return render_to_response('abscontrol/import.html', {'profile_list': profile_list,})
             def showImport(request):
                 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()
                 else:
                     txtFilename = "Error"
                     #content = "Error"
                     expName = ""
                     num_patterns = 0
                 return render_to_response('abscontrol/upload-edit.html', {'txtFilename': txtFilename, 'patterns' : patterns,
                                                                           'expName' : expName, 'num_patterns' : num_patterns,
                                                                           })
             def saveImport(request):
                 patterns = []
                 expName = request.POST["txtProfile"]
                 num_patterns = int(request.POST["txtNumPatterns"])
                 newprofile = Profile(name=expName)
                 newprofile.save()
                 for i in range(0,num_patterns):
                     number = request.POST["txtNumberPattern"+str(i+1)]
                     txtAntennaUp = request.POST["txtAntennaUp"+str(i+1)]
                     txtAntennaDown = request.POST["txtAntennaDown"+str(i+1)]
                     dicPattern = {"number" : number, "up" : txtAntennaUp, "down" : txtAntennaDown}
                     patterns.append(dicPattern)
                     newpattern = newprofile.pattern_set.create(value=number)
                     newpattern.antennaup_set.create(value=txtAntennaUp)
                     newpattern.antennadown_set.create(value=txtAntennaDown)
                 newurl = '/abscontrol/view/%d' % newprofile.id
                 return redirect(newurl)
                 '''
                 return render_to_response('abscontrol/upload-view.html', {'expName' : expName, 'patterns' : patterns,
                                                                           'num_patterns' : num_patterns,
                                                                           })
                 '''
             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)
+                objProfile.hits += 1
+                objProfile.save()
+                message = "File sent successfully."
+                profile_list = Profile.objects.all()
+                return render_to_response('abscontrol/sendFile.html', {'message': message, "profile_list" : profile_list,
+                                                                       'objProfile': objProfile,
+                                                                       })

trunk/webapp/static/js/patterns.js +4 -4

             /**
              * @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();
                     }
                 });
                 $('#lnkSave').click(function() {
                    $('#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()
                     }
                 });
                 $('#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 + "/";
+                });
             });

trunk/webapp/static/js/profiles.js +4 0

             /**
              * @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();
                     }
                 });
                 $('.activeOverJRO').click(function() {
                     profile_id = $('input[name=txtProfileId]').val();
                     pattern_id = $('input[name=txtPatternId]').val();
                     field_Id = $(this).attr("id");
                     field_value = $('input[name=txtAntenna'+field_Id+'Id]').val();
                     url = "/abscontrol/"+profile_id+"/"+pattern_id+"/overjro/"+field_value+"/?beam="+field_Id;
                     alert(url);
                 });
                 $('#lnkSaveImport').click(function(){
                 	$('#frmImportProfile').submit();
                 });
                 $('#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 + "/";
+                });
             });

trunk/webapp/templates/abscontrol/index.html +1 -1

             {% extends "base.html" %}
             {% block title %}ABS CONTROL:::::{% endblock %}
             {% block scripting %}
             	{% if profile_list %}
             	<script src="/static/static/js/profiles.js"></script>
             	{% endif %}
             {% endblock %}
             {% block content %}
             <div id="content">
                 {% block leftcolumn %}
                 <div id="leftcolumn">
                     <div id="lsProfiles">
                         <div id="infoProfiles">
                             <label for="lblProfile" class="lblInfo">Profiles:</label><br />
                             {% if profile_list %}
                             <select name="lsProfiles" id="listProfiles">
                                 <option value="-1">Choose ...</option>
                             {% for entry in profile_list %}
                             	{% if objProfile %}
                             		{% if objProfile.id == entry.id %}
                                 <option value="{{ entry.id }}" selected>{{ entry.name }}</option>
                                 	{% else %}
                                 <option value="{{ entry.id }}">{{ entry.name }}</option>
                                 	{% endif %}
                                 {% else %}
                                 <option value="{{ entry.id }}">{{ entry.name }}</option>
                                 {% endif %}
                             {% endfor %}
                             </select>
                             {% else %}
                             <label for="lblMessage" class="lblInfo">No profiles.</label>
                             {% endif %}
                         </div>
                     </div>
                     {% block mnu_profile %}
                     <nav class="MnuVertical" id="mnuProfiles">
                         <ul>
                             <li><a href="/abscontrol/new">New</a></li>
                             {% if objProfile %}
                             <li><a href="/abscontrol/edit/{{ objProfile.id }}">Edit</a></li>
                             <li><a href="#">Save</a></li>
                             {% endif %}
                             <li><a href="#">Save as</a></li>
                             <li><a href="/abscontrol/import">Import</a></li>
                             {% if objProfile %}
                             <li><a href="#" id="lnkExport" alt="{{ objProfile.id }}">Export</a></li>
-                            <li><a href="#">Apply</a></li>
+                            <li><a href="#" id="lnkSendFile" alt="{{ objProfile.id }}">Send</a></li>
                             {% endif %}
                         </ul>
                     </nav>
                     {% endblock %}
                 </div>
                 {% endblock %}
                 {% block maincolumn %}
                 <div id="maincolumn">
                 </div>
                 {% endblock %}
                 <div class="cleardivs"></div>
             </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