# SVN changeset patch
# User jsalyrosas
# Date 2013-05-23 02:21:51.285841
# Revision 184

- Estandarizada la funcion de importar archivos ABS para utilizar el mismo formato de manejo de perfiles.

Index: trunk/webapp/abscontrol/urls.py
===================================================================
diff --git a/trunk/webapp/abscontrol/urls.py b/trunk/webapp/abscontrol/urls.py
--- a/trunk/webapp/abscontrol/urls.py	(revision 183)
+++ b/trunk/webapp/abscontrol/urls.py	(revision 184)
@@ -17,8 +17,8 @@
     #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'^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'),
Index: trunk/webapp/abscontrol/views.py
===================================================================
diff --git a/trunk/webapp/abscontrol/views.py b/trunk/webapp/abscontrol/views.py
--- a/trunk/webapp/abscontrol/views.py	(revision 183)
+++ b/trunk/webapp/abscontrol/views.py	(revision 184)
@@ -293,7 +293,7 @@
     profile_list = Profile.objects.filter(state=1)
     return render_to_response('abscontrol/import.html', {'profile_list': profile_list,})
 
-def showImport(request):
+def upload(request):
     profile_list = Profile.objects.filter(state=1)
     if request.method == 'POST':
         txtFilename = request.FILES['txtFile']
@@ -305,44 +305,29 @@
             filename = '/tmp/'+txtFilename.name
             readFile = readABSFile(filename)
             expName, num_patterns, patterns = readFile.getMetadata()
-    else:
-        txtFilename = "Error"
-        #content = "Error"
-        expName = ""
-        num_patterns = 0
+            
+            if expName != "" and num_patterns > 0:
+                newprofile = Profile(name=expName)
+                newprofile.save()
+                newprofile.state = 1
+                
+                for element in patterns:
+                    newpattern = newprofile.pattern_set.create(value=element["number"])
+                    newpattern.antennaup_set.create(value=element["up"])
+                    newpattern.antennadown_set.create(value=element["down"])
+                
+                newprofile.save()
+                
+                newurl = '/abscontrol/edit/%d' % int(newprofile.id)
+                return redirect(newurl)
+            else:
+                txtError = "Experiment's name not found or the number of patterns is 0."
+                return render_to_response('abscontrol/error.html', {'profile_list': profile_list, 
+                                                                    'txtError' : txtError, })
+    else:
+        txtError = "No file."
         
-    return render_to_response('abscontrol/upload-edit.html', {'txtFilename': txtFilename, 'patterns' : patterns,
-                                                              'expName' : expName, 'num_patterns' : num_patterns,
-                                                              'profile_list': profile_list,
-                                                              })
-
-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,
-                                                              })
-    '''
+        return render_to_response('abscontrol/error.html', {'profile_list': profile_list, 'txtError' : txtError, })
 
 def overJRO(request, profile_id, pattern_id, antenna_id):
     if request.GET["beam"] == "Up":
Index: trunk/webapp/templates/abscontrol/error.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/error.html b/trunk/webapp/templates/abscontrol/error.html
new file mode 10644
--- /dev/null	(revision 0)
+++ b/trunk/webapp/templates/abscontrol/error.html	(revision 184)
@@ -0,0 +1,23 @@
+{% extends "abscontrol/index.html" %}
+{% block title %}ABS CONTROL:::::IMPORT PROFILE{% endblock %}
+{% block scripting %}
+	<script src="/static/static/js/profiles.js"></script>
+{% endblock %}
+{% block mnu_profile %}
+<nav class="MnuHorizontal" id="mnuProfiles">
+    <ul>
+        <li><a href="/abscontrol/new">New</a></li>
+        <li><a href="/abscontrol/import">Import</a></li>        
+    </ul>
+</nav>
+{% endblock %}
+{% block maincolumn %}
+<div id="maincolumn">
+    <div id="divPattern">
+        <div class="divUes">
+            <label for="lblError">Error:</label>
+            <p>{{ txtError }}</p>
+        </div>
+    </div>
+</div>
+{% endblock %}
Index: trunk/webapp/templates/abscontrol/import.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/import.html b/trunk/webapp/templates/abscontrol/import.html
--- a/trunk/webapp/templates/abscontrol/import.html	(revision 183)
+++ b/trunk/webapp/templates/abscontrol/import.html	(revision 184)
@@ -11,7 +11,7 @@
 {% endblock %}
 {% block maincolumn %}
 <div id="maincolumn">
-    <form name="frmImport" id="frmImport" action="/abscontrol/showImport/" method="post" enctype="multipart/form-data">
+    <form name="frmImport" id="frmImport" action="/abscontrol/upload/" method="post" enctype="multipart/form-data">
     <div id="divPattern">
         <div class="divUes">
             <label for="lblFile">Choose File:</label>
Index: trunk/webapp/templates/abscontrol/upload-edit.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/upload-edit.html b/trunk/webapp/templates/abscontrol/upload-edit.html
deleted file mode 10644
--- a/trunk/webapp/templates/abscontrol/upload-edit.html	(revision 183)
+++ /dev/null	(revision 184)
@@ -1,56 +0,0 @@
-{% extends "abscontrol/index.html" %}
-{% block title %}ABS CONTROL:::::IMPORT PROFILE{% endblock %}
-{% block scripting %}
-	<script src="/static/static/js/profiles.js"></script>
-{% endblock %}
-{% block mnu_profile %}
-<nav class="MnuHorizontal" id="mnuProfiles">
-    <ul>
-        <li><a href="/abscontrol/new">New</a></li>
-        <li><a href="#" id="lnkSaveImport">Save</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 %}
-{% block maincolumn %}
-<div id="maincolumn">
-    <div id="divPattern">
-        <div class="divUes">
-            <label for="lblFile">File: {{ txtFilename }}</label>
-        </div>
-        <form action="/abscontrol/saveImport/" id="frmImportProfile" method="post">
-        <div class="divUes">
-            <label for="lblExperiment">Experiment: </label>
-            <input type="text" name="txtProfile" value="{{ expName }}">
-            <br />
-            <label for="lblNumber">Number of patterns: {{ num_patterns }}</label>
-            <input type="hidden" name="txtNumPatterns" value="{{ num_patterns }}" />
-        </div>
-        {% if patterns %}
-        <div class="divListofPatterns">
-        	{% for element in patterns %}
-            <div class="divPattern">
-                <div>
-                    <label for="lblNumber">Pattern: {{ element.number }}</label>
-                    <input type="hidden" name="txtNumberPattern{{ element.number }}" value="{{ element.number }}" />
-                </div>
-                <div class="divAntenna">
-                    <label for="lblAntennaUp">Antenna Up:</label>
-                    <textarea name="txtAntennaUp{{ element.number }}" class="txtAntenna" cols="38" rows="8">{{ element.up }}</textarea>    
-                </div>
-                <div class="divAntenna">
-                    <label for="lblAntennaDown">Antenna Down:</label>
-                    <textarea name="txtAntennaDown{{ element.number }}" class="txtAntenna" cols="38" rows="8">{{ element.down }}</textarea>    
-                </div>
-                <div class="cleardivs"></div>
-            </div>
-            <div class="cleardivs"></div>
-            {% endfor %}
-        </div>
-        {% endif %}
-        </form>
-    </div>
-</div>
-{% endblock %}
Index: trunk/webapp/templates/abscontrol/upload-view.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/upload-view.html b/trunk/webapp/templates/abscontrol/upload-view.html
deleted file mode 10644
--- a/trunk/webapp/templates/abscontrol/upload-view.html	(revision 183)
+++ /dev/null	(revision 184)
@@ -1,45 +0,0 @@
-{% extends "abscontrol/index.html" %}
-{% block title %}ABS CONTROL:::::IMPORT PROFILE{% endblock %}
-
-{% block mnu_profile %}
-<nav class="MnuHorizontal" id="mnuProfiles">
-    <ul>
-        <li><a href="/abscontrol/new">New</a></li>
-        <li><a href="#">Save</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 %}
-{% block maincolumn %}
-<div id="maincolumn">
-    <div id="divPattern">
-        <div class="divUes">
-            <label for="lblExperiment">Experiment: {{ expName }}</label><br />
-            <label for="lblNumber">Number of patterns: {{ num_patterns }}</label>
-        </div>
-        {% if patterns %}
-        <div class="divListofPatterns">
-            {% for element in patterns %}
-            <div class="divPattern">
-                <div>
-                    <label for="lblNumber">Pattern: {{ element.number }}</label>
-                </div>
-                <div class="divAntenna">
-                    <label for="lblAntennaUp">Antenna Up:</label>
-                    <p>{{ element.up }}</p>    
-                </div>
-                <div class="divAntenna">
-                    <label for="lblAntennaDown">Antenna Down:</label>
-                    <p>{{ element.down }}</p>    
-                </div>
-                <div class="cleardivs"></div>
-            </div>
-            <div class="cleardivs"></div>
-            {% endfor %}
-        </div>
-        {% endif %}
-    </div>
-</div>
-{% endblock %}