ABS/abscontrol Commit - r175:176 · Jicamarca Repository

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

jsalyrosas -

r175:176

parent child

Context file:

r175:176

Collapse all files

trunk/webapp/abscontrol/models.py +1 -1

                     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()

trunk/webapp/abscontrol/urls.py +1 0

                 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'),

trunk/webapp/abscontrol/views.py +31 -10

             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
             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,
                                                                    })
             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,
                                                                          })
             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)
                 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 len(lsPatterns) > 0:
-                        if element.value > maxValuePattern:
+                        for element in lsPatterns:
-                            maxPattern = element.value
+                            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)

trunk/webapp/static/js/patterns.js +5 -1

                         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();
                 });
                     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(){

trunk/webapp/templates/abscontrol/addPattern.html +1 0

                     </fieldset>
                 </div>
                     <input type="hidden" name="profile_id" id="profile_id" value="{{ objProfile.id }}" />
+                    <input type="hidden" name="mode" value="e">
                 </form>
             </div>
             {% endblock %}

trunk/webapp/templates/abscontrol/editPattern.html +16 -7

             <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>
             {% endblock %}
             {% block pattern %}
             <div id="infoPattern">
-                {% if patternChoosen %}
+            	<div id="navPatterns">
-                <div id="navPatterns">
+                    <nav class="" id="navPatternList">
-                    <label for="lblValue">Pattern:</label>
+                        <ul>
-                    <label for="lblPatternValue">{{ patternChoosen.value }}</label>
+                        {% 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">
                 <input type="hidden" name="profile_id" id="profile_id" value="{{ objProfile.id }}" />
                 </form>
             </div>
-            {% endblock %}
+            {% endblock %}
  No newline at end of file

trunk/webapp/templates/abscontrol/new.html +16 -5

             {% 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>
+                    <label for="lblName">Profile: {{ profile_name }}</label>
-                    <input type="text" name="txtProfile" id="" value="" />
-                    <input type="submit" value="Save" />
                 </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">
                         </fieldset>
                     </div>
                 </div>
+                	<input type="hidden" name="mode" value="e">
                 </form>
             </div>
             {% endblock %}

trunk/webapp/util/saveABSFile.py +1 -9

@@ -50,15 +50,7
50	return value	50	return value
51		51
52	def setFilename(self):	52	def setFilename(self):
53	initialTime = datetime.today()	53	return datetime.today().strftime("%Y%m%d%H%M%S%f")
54	filename = str(initialTime)
55
56	filename = filename.replace("-","")
57	filename = filename.replace(":","")
58	filename = filename.replace(".","")
59	filename = filename.replace(" ","")
60
61	return filename
62		54
63	def saveFile(self, filename):	55	def saveFile(self, filename):
64	f = open(filename, 'a+')	56	f = open(filename, 'a+')

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