Changeset 10816

Timestamp:

08/05/11 14:33:13 (22 months ago)

Author:

edent

Message:

Add install/uninstall function and lists active waveforms

Location:

ossiedev/trunk/tools/cornetApps

Files:

• HtmlPages/static/frames.js (modified) (5 diffs)
• HtmlPages/views.py (modified) (2 diffs)
• HtmlPages/views.pyc (modified) (previous)
• cornetApps.db (modified) (previous)
• templates/HtmlPages/ossie.html (modified) (1 diff)
• templates/HtmlPages/running.html (modified) (1 diff)
• templates/HtmlPages/waveforms.html (modified) (1 diff)
• urls.py (modified) (1 diff)

ossiedev/trunk/tools/cornetApps/HtmlPages/static/frames.js

@@ -4 +4 @@
     $(this).css('background-color', '#3e1');
   });
+});
+
+$(function closePage(){
+  window.onbeforeunload=function(){
+    return 'Please remember to uninstall ALL WAVEFORMS and scripts before leaving.';}
 });
 
@@ -21 +26 @@
 });
 
-$(function closePage(){
-  window.onbeforeunload=function(){
-    return 'Please remember to uninstall ALL WAVEFORMS and scripts before leaving.';}
+$("#left_bottom").ready(function(){
+        $("#apps").load("/running/");
 });
 
@@ -36 +40 @@
 var tabsIdRightTop = '#right_top .tabs';
 
-$("#right-top").ready(function(){
+$("#right_top").ready(function(){
      // Preload tab on page load
      if($(tabsIdRightTop + ' LI.current  A').length > 0){
@@ -53 +57 @@
 tabsIdRightBot = "#right_bottom .tabs"
 
-$("#right-bottom").ready(function(){
+$("#right_bottom").ready(function(){
      // Preload tab on page load
      if($(tabsIdRightBot + 'LI.current  A').length > 0){
@@ -77 +81 @@
 }
 
+function install(waveform){
+        $("#apps").load("/install/"+waveform);
+}
+
+function uninstall(waveform){
+        $("#apps").load("/uninstall/"+waveform);
+}

ossiedev/trunk/tools/cornetApps/HtmlPages/views.py

@@ -64 +64 @@
         return render_to_response("HtmlPages/nodes.html", locals(), context_instance=RequestContext(request))
 
-def waveforms(request):
-        ctrlr = Controller(False)
-        ctrlr.createWidgetContainer()
-        ctrlr.CORBAutils.init_CORBA(False)
-        ctrlr.buildModel()
-
-        availableList = ctrlr.model.getSystemWaveforms()
-
-        return render_to_response("HtmlPages/waveforms.html", locals(), context_instance=RequestContext(request))
-
 def register_page(request):
         if request.method == 'POST':
@@ -88 +78 @@
         variables = RequestContext(request, {'form':form})
         return render_to_response('registration/register.html', variables)      
+        
+def buildWebDash():
+        ctrlr = Controller(False)
+        ctrlr.createWidgetContainer()
+        ctrlr.CORBAutils.init_CORBA(False)
+        ctrlr.buildModel()
+        return ctrlr
+
+def waveforms(request):
+        ctrlr = buildWebDash()
+        availableList = ctrlr.model.getSystemWaveforms()
+        return render_to_response("HtmlPages/waveforms.html", locals(), context_instance=RequestContext(request))
+
+def running_page(request):
+        ctrlr = buildWebDash()
+
+        availableList = ctrlr.model.getSystemWaveforms()
+        instancesList = []      
+        instances = []
+        for waveform in availableList:
+                instances = ctrlr.model.getInstanceWaveforms(waveform.getName())
+                if instances:
+                        for instance in instances:
+                                instancesList.append(instance)
+        
+        return render_to_response('HtmlPages/running.html', {'instancesList' : instancesList})
+
+def install(request, waveform_to_install):
+        ctrlr = buildWebDash()
+        instance = ctrlr.installWaveform(waveform_to_install, True)
+        return running_page(request)
+        
+def uninstall(request, instance_to_uninstall):
+        ctrlr = buildWebDash()
+        uninstall = ctrlr.uninstallWaveform(instance_to_uninstall)
+        return running_page(request)

ossiedev/trunk/tools/cornetApps/templates/HtmlPages/ossie.html

@@ -15 +15 @@
   <div id="left_bottom">
    <p>Active Applications</p>
+   <div id="apps"></div>
   </div><!--end #left_bottom-->
  </div><!--end #column_left-->

ossiedev/trunk/tools/cornetApps/templates/HtmlPages/running.html

@@ -1 +1 @@
 {% if instancesList %}
-<h1>Running Instances</h1>
+<!--<h1>Running Instances</h1>-->
 <table>
         {% for instance in instancesList %}
                 <tr>
                 <td>    <a href='/WebDash/{{ instance.getName }}/display/'>{{ instance.getName }}</a>&nbsp;</td>
-                <td>    <button onClick="window.location='/WebDash/{{ instance.getName }}/uninstall/'">Uninstall </button></td>                                 
+                <!--<td>        <button onClick="window.location='/WebDash/{{ instance.getName }}/uninstall/'">Uninstall </button></td>-->
+                <td><button onClick="javascript:uninstall('{{ instance.getName }}');">Uninstall</button></td>
                 </tr>
         {% endfor %}
 </table>
 {% else %}
-        <p>No waveforms currently running.<p>
+        <p>No running waveforms.<p>
 {% endif %}

ossiedev/trunk/tools/cornetApps/templates/HtmlPages/waveforms.html

@@ -5 +5 @@
   <tr>
         <td>    {{ wave.getName }} &nbsp; </td>
-    <td>    <button onClick="window.location='/WebDash/{{ wave.getName }}/install/'">Install</button> </td>
+    <!--<td>    <button onClick="window.location='/WebDash/{{ wave.getName }}/install/'">Install</button> </td>-->
+    <td>    <button onClick="javascript:install('{{ wave.getName }}');">Install</button> </td>
     {% endfor %}
   </tr>
  </table>
 {% else %}
-        <p>No waveforms currently running.</p>
+        <p>No available waveforms. Check if nodebooter is running.</p>
 {% endif %}

ossiedev/trunk/tools/cornetApps/urls.py

@@ -25 +25 @@
         url(r'^waveforms/$', 'HtmlPages.views.waveforms'),
         url(r'^register/$', 'HtmlPages.views.register_page'),
+    url(r'^install/(?P<waveform_to_install>.*)/$', 'HtmlPages.views.install'),
+    url(r'^uninstall/(?P<instance_to_uninstall>.*)/', 'HtmlPages.views.uninstall'),
+    url(r'^running/$', 'HtmlPages.views.running_page'),
 
     # url(r'^cornetApps/', include('cornetApps.foo.urls')),