ABS/abscontrol Commit - r147:148 · Jicamarca Repository

- Implementando la funcion Import. (Desarrollo no concluido)

jsalyrosas -

r147:148

parent child

Context file:

r147:148

Collapse all files

trunk/webapp/templates/abscontrol/import.html created 10644 +16 0

@@ -0,0 +1,16
	1	{% extends "abscontrol/index.html" %}
	2	{% block title %}ABS CONTROL:::::IMPORT PROFILE{% endblock %}
	3
	4	{% block content %}
	5	<div id="content">
	6	<form action="/abscontrol/saveImport/" method="post" enctype="multipart/form-data">
	7	<div id="divPattern">
	8	<div class="divUes">
	9	<label for="lblFile">Choose File:</label>
	10	<input type="file" name="txtFile" />
	11	<input type="submit" name="btnSend" value="Upload" />
	12	</div>
	13	</div>
	14	</form>
	15	</div>
	16	{% endblock %}

trunk/webapp/templates/abscontrol/upload.html created 10644 +17 0

@@ -0,0 +1,17
	1	{% extends "abscontrol/index.html" %}
	2	{% block title %}ABS CONTROL:::::IMPORT PROFILE{% endblock %}
	3
	4	{% block content %}
	5	<div id="content">
	6	<div id="divPattern">
	7	<div class="divUes">
	8	<label for="lblFile">File:</label>
	9	<label for="lblFilename">{{ txtFilename }}</label>
	10	</div>
	11	<div class="divUes">
	12	<label for="lblFile">content:</label>
	13	<p>{{ content }}</p>
	14	</div>
	15	</div>
	16	</div>
	17	{% endblock %}

trunk/webapp/util/__init__.py created 10644 0 0

NO CONTENT: new file 10644

trunk/webapp/util/readABSFile.py created 10644 +20 0

@@ -0,0 +1,20
	1	'''
	2	Created on May 2, 2013
	3
	4	@author: Jose Antonio Sal y Rosas Celi
	5	@contact: jose.salyrosas@jro.igp.gob.pe
	6	'''
	7
	8	class readABSFile(object):
	9
	10	__scriptName = "readABSFile.py"
	11
	12	def __init__(self, filename):
	13	self.fileName = filename
	14
	15	def readFile(self):
	16	destination = open(self.fileName, 'wb+')
	17
	18	destination.close()
	19
	20	No newline at end of file

trunk/webapp/abscontrol/admin.py +13 -4

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

trunk/webapp/abscontrol/urls.py +2 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'^saveImport/$', 'saveImport'),
             )

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

             from django.shortcuts import render_to_response, redirect
             from abscontrol.models import Profile, Pattern, AntennaDown, AntennaUp
             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):
+                return render_to_response('abscontrol/import.html', { })
+            def saveImport(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()
+                        f = open('/tmp/'+txtFilename.name, 'r')
+                        content = f.read()
+                        #for line in f:
+                        #    lsLine = line.readline()
+                        f.close()
+                        #content = lsLine
+                else:
+                    txtFilename = "Error"
+                    content = "Error"
+                return render_to_response('abscontrol/upload.html', {'txtFilename': txtFilename, 'content' : content})

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="#">Import</a></li>
+                            <li><a href="/abscontrol/import">Import</a></li>
                             <li><a href="#">Export</a></li>
                             <li><a href="#">Apply</a></li>
                         </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