# SVN changeset patch
# User jsalyrosas
# Date 2013-05-20 03:32:22.891722
# Revision 176

- Modificadas la funcionalidades basicas y la navegacion de la aplicacion web.

Index: trunk/webapp/abscontrol/models.py
===================================================================
diff --git a/trunk/webapp/abscontrol/models.py b/trunk/webapp/abscontrol/models.py
--- a/trunk/webapp/abscontrol/models.py	(revision 175)
+++ b/trunk/webapp/abscontrol/models.py	(revision 176)
@@ -16,7 +16,7 @@
         if self.pk is None:
             self.date_create = timezone.now()
             self.hits = 0
-            self.state = 1
+            self.state = 0
         else:
             self.date_modified = timezone.now()
         super(Profile, self).save()
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 175)
+++ b/trunk/webapp/abscontrol/urls.py	(revision 176)
@@ -6,6 +6,7 @@
     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+)/edit/$', 'edit'),
     #url(r'^(?P<profile_id>\d+)/$', 'detail'),
     url(r'^(?P<profile_id>\d+)/add/$', 'addPattern'),
     url(r'^(?P<profile_id>\d+)/save/$', 'savePattern'),
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 175)
+++ b/trunk/webapp/abscontrol/views.py	(revision 176)
@@ -4,7 +4,11 @@
 from django.utils.encoding import smart_str
 from django.core.servers.basehttp import FileWrapper
 import mimetypes
+
+from datetime import datetime
+
 from abscontrol.models import Profile, Pattern, AntennaDown, AntennaUp
+
 from util.readABSFile import readABSFile
 from util.saveABSFile import saveABSFile
 from scripts.sendFile import sendFile
@@ -58,14 +62,22 @@
 
 def index(request):
     #latest_poll_list = profileAntenna.objects.all().order_by('-pub_date')[:5]
-    profile_list = Profile.objects.all()
+    profile_list = Profile.objects.filter(state=1)
     return render_to_response('abscontrol/index.html', {'profile_list': profile_list})
 
 def new(request):
-    profile_list = Profile.objects.all()
+    profile_list = Profile.objects.filter(state=1)
+    txtProfile = datetime.now().strftime("%Y%m%d%H%M%S%f")
+    newprofile = Profile(name=txtProfile)
+    newprofile.save()
+    
+    lsPatterns = None
     
     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,
@@ -144,7 +156,7 @@
                                                        })
 
 def addPattern(request, profile_id):
-    profile_list = Profile.objects.all()
+    profile_list = Profile.objects.filter(state=1)
     objProfile = Profile.objects.get(pk=profile_id)
     
     return render_to_response('abscontrol/addPattern.html', {'objProfile': objProfile, 'profile_list': profile_list,
@@ -154,7 +166,7 @@
                                                              })
 
 def editPattern(request, profile_id, pattern_id):
-    profile_list = Profile.objects.all()
+    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)
@@ -185,22 +197,31 @@
     txtRxDown = request.POST["txtRxDown"]
     txtUesDown = request.POST["txtUesDown"]
     
+    mode = request.POST["mode"]
+    
     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 len(lsPatterns) > 0:
+            for element in lsPatterns:
+                if element.value > maxValuePattern:
+                    maxPattern = element.value
+        else:
+            maxPattern = 0
         
         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
+            
+        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:
-            newurl = '/abscontrol/edit/%d' % (int(profile_id))
     else:
         txtAntennaUpId = request.POST["txtAntennaUpId"]
         objAntennaUp = AntennaUp.objects.get(pk=txtAntennaUpId)
Index: trunk/webapp/static/js/patterns.js
===================================================================
diff --git a/trunk/webapp/static/js/patterns.js b/trunk/webapp/static/js/patterns.js
--- a/trunk/webapp/static/js/patterns.js	(revision 175)
+++ b/trunk/webapp/static/js/patterns.js	(revision 176)
@@ -9,6 +9,10 @@
             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(); 
     });
@@ -16,7 +20,7 @@
         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/" + $("#profile_id").val() + "/view/" + $("#pattern_id").val();
         }
     });
     $('#lnkExport').click(function(){
Index: trunk/webapp/templates/abscontrol/addPattern.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/addPattern.html b/trunk/webapp/templates/abscontrol/addPattern.html
--- a/trunk/webapp/templates/abscontrol/addPattern.html	(revision 175)
+++ b/trunk/webapp/templates/abscontrol/addPattern.html	(revision 176)
@@ -59,6 +59,7 @@
         </fieldset>
     </div>
         <input type="hidden" name="profile_id" id="profile_id" value="{{ objProfile.id }}" />
+        <input type="hidden" name="mode" value="e">
     </form>
 </div>
 {% endblock %}
Index: trunk/webapp/templates/abscontrol/editPattern.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/editPattern.html b/trunk/webapp/templates/abscontrol/editPattern.html
--- a/trunk/webapp/templates/abscontrol/editPattern.html	(revision 175)
+++ b/trunk/webapp/templates/abscontrol/editPattern.html	(revision 176)
@@ -4,8 +4,9 @@
 <div class="divMenu" id="divMnuPattern">
     <nav class="MnuHorizontal">
         <ul class="mnu" id="mnuPattern">
+        	<li><a href="#" id="lnkAdd">Add</a></li>
             <li><a href="#" id="lnkSave">Save</a></li>
-            <li><a href="#" id="lnkCancel">Cancel</a></li>
+            <li><a href="#" id="lnkCancel">Delete</a></li>
         </ul>
     </nav>
 </div>
@@ -13,12 +14,20 @@
 {% endblock %}
 {% block pattern %}
 <div id="infoPattern">
-    {% if patternChoosen %}
-    <div id="navPatterns">
-        <label for="lblValue">Pattern:</label>
-        <label for="lblPatternValue">{{ patternChoosen.value }}</label>
+	<div id="navPatterns">
+        <nav class="" id="navPatternList">
+            <ul>
+            {% for element in lsPatterns %}
+                {% if patternChoosen.id == element.id %}
+                <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>
+                {% else %}
+                <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPattern">{{ element.value }}</a></li>
+                {% endif %}
+            {% endfor %}
+            </ul>
+        </nav>
     </div>
-    {% endif %}
+    <div class="cleardivs"></div>
     <form action="/abscontrol/{{ objProfile.id }}/save/" id="frmPattern" method="post">
     <div id="antennaUp">
         <fieldset class="flsAntenna">
@@ -70,4 +79,4 @@
     <input type="hidden" name="profile_id" id="profile_id" value="{{ objProfile.id }}" />
     </form>
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
Index: trunk/webapp/templates/abscontrol/new.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/new.html b/trunk/webapp/templates/abscontrol/new.html
--- a/trunk/webapp/templates/abscontrol/new.html	(revision 175)
+++ b/trunk/webapp/templates/abscontrol/new.html	(revision 176)
@@ -1,14 +1,24 @@
 {% 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/save/" method="post">
+    <form action="/abscontrol/{{ profile_id }}/save/" method="post" id="frmPattern">
     <div id="divProfile">
-        <label for="lblName">Profile:</label>
-        <input type="text" name="txtProfile" id="" value="" />
-        <input type="submit" value="Save" />
+        <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="lnkSave">Save</a></li>
+            </ul>
+        </nav>
+    </div>
+    <div class="cleardivs"></div>
+    {% endblock %}
     <div id="divPattern">
         <div id="antennaUp">
             <fieldset class="flsAntenna">
@@ -59,6 +69,7 @@
             </fieldset>
         </div>
     </div>
+    	<input type="hidden" name="mode" value="e">
     </form>
 </div>
 {% endblock %}
Index: trunk/webapp/util/saveABSFile.py
===================================================================
diff --git a/trunk/webapp/util/saveABSFile.py b/trunk/webapp/util/saveABSFile.py
--- a/trunk/webapp/util/saveABSFile.py	(revision 175)
+++ b/trunk/webapp/util/saveABSFile.py	(revision 176)
@@ -50,15 +50,7 @@
         return value
     
     def setFilename(self):
-        initialTime = datetime.today()
-        filename = str(initialTime)
-        
-        filename = filename.replace("-","")
-        filename = filename.replace(":","")
-        filename = filename.replace(".","")
-        filename = filename.replace(" ","")
-    
-        return filename
+        return datetime.today().strftime("%Y%m%d%H%M%S%f")        
     
     def saveFile(self, filename):
         f = open(filename, 'a+')