# SVN changeset patch
# User jsalyrosas
# Date 2013-05-09 06:19:37.846760
# Revision 156

- Almacenados los datos del archivo ABS despues de ser importado.

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 155)
+++ b/trunk/webapp/abscontrol/urls.py	(revision 156)
@@ -15,6 +15,7 @@
     #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'),
 )
\ No newline at end of file
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 155)
+++ b/trunk/webapp/abscontrol/views.py	(revision 156)
@@ -238,10 +238,10 @@
     return redirect(newurl)
 
 def importProfile(request):
-    
-    return render_to_response('abscontrol/import.html', { })
-
-def saveImport(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:
@@ -258,9 +258,37 @@
         expName = ""
         num_patterns = 0
         
-    return render_to_response('abscontrol/upload.html', {'txtFilename': txtFilename, 'patterns' : patterns,
-                                                         'expName' : expName, 'num_patterns' : num_patterns,
-                                                         })
+    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":
@@ -277,5 +305,3 @@
     only_rx = objAntenna.only_rx
     
     return exp_name, phase_tx, gain_tx, gain_rx, ues_tx, only_rx
-    
-    
Index: trunk/webapp/static/js/profiles.js
===================================================================
diff --git a/trunk/webapp/static/js/profiles.js b/trunk/webapp/static/js/profiles.js
--- a/trunk/webapp/static/js/profiles.js	(revision 155)
+++ b/trunk/webapp/static/js/profiles.js	(revision 156)
@@ -17,4 +17,7 @@
         url = "/abscontrol/"+profile_id+"/"+pattern_id+"/overjro/"+field_value+"/?beam="+field_Id;
         alert(url);
     });
+    $('#lnkSaveImport').click(function(){
+    	$('#frmImportProfile').submit();
+    });
 });
\ No newline at end of file
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 155)
+++ b/trunk/webapp/templates/abscontrol/import.html	(revision 156)
@@ -1,9 +1,9 @@
 {% extends "abscontrol/index.html" %}
 {% block title %}ABS CONTROL:::::IMPORT PROFILE{% endblock %}
 
-{% block content %}
-<div id="content">
-    <form action="/abscontrol/saveImport/" method="post" enctype="multipart/form-data">
+{% block maincolumn %}
+<div id="maincolumn">
+    <form action="/abscontrol/showImport/" method="post" enctype="multipart/form-data">
     <div id="divPattern">
         <div class="divUes">
             <label for="lblFile">Choose File:</label>
@@ -13,4 +13,4 @@
     </div>
     </form>
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
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
new file mode 10644
--- /dev/null	(revision 0)
+++ b/trunk/webapp/templates/abscontrol/upload-edit.html	(revision 156)
@@ -0,0 +1,56 @@
+{% 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="MnuVertical" 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
new file mode 10644
--- /dev/null	(revision 0)
+++ b/trunk/webapp/templates/abscontrol/upload-view.html	(revision 156)
@@ -0,0 +1,45 @@
+{% extends "abscontrol/index.html" %}
+{% block title %}ABS CONTROL:::::IMPORT PROFILE{% endblock %}
+
+{% block mnu_profile %}
+<nav class="MnuVertical" 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 %}
Index: trunk/webapp/templates/abscontrol/upload.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/upload.html b/trunk/webapp/templates/abscontrol/upload.html
deleted file mode 10644
--- a/trunk/webapp/templates/abscontrol/upload.html	(revision 155)
+++ /dev/null	(revision 156)
@@ -1,37 +0,0 @@
-{% extends "abscontrol/index.html" %}
-{% block title %}ABS CONTROL:::::IMPORT PROFILE{% endblock %}
-
-{% block content %}
-<div id="content">
-    <div id="divPattern">
-        <div class="divUes">
-            <label for="lblFile">File: {{ txtFilename }}</label>
-        </div>
-        <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 %}