radarsys Commit - r258:0e34c33380c6 · Jicamarca Repository

Task #961: Actualizar status de modulos ABS con subproceso...

Fiorella Quino -

r258:0e34c33380c6

parent child

Context file:

r258:0e34c33380c6

apps/abs/models.py +12 -1

                     return parameters
                 def dict_to_parms(self, parameters):
                     self.name = parameters['name']
                     self.module_messages = json.dumps(module_messages)
                     self.save()
+                    print 'Termino (='
                     return
                     This function returns the status of all abs-modules as one.
                     If at least one module is connected, its answer is "1"
                     """
-                    self.absmodule_status()
+                    #self.absmodule_status()
+                    send_task('status_absdevice', [self.id],)
                     connected_modules = self.connected_modules()
                     if connected_modules>0:
                         self.message = 'ABS modules Status have been updated.'
                         return 1
+                    else:
+                        self.device.status=0
                     self.message = 'No ABS module is connected.'
+                    self.save()
                     return 0
                     return reverse('url_import_abs_conf', args=[str(self.id)])
+                def get_absolute_url_status(self):
+                    return reverse('url_status_abs_conf', args=[str(self.id)])
             class ABSBeam(models.Model):

apps/abs/tasks.py +9 0

@@ -52,3 +52,12 def task_change_beam(id_conf):
52		52
53		53
54	return 2	54	return 2
		55
		56
		57	@task(name='status_absdevice')
		58	def status_absdevice(id_conf):
		59
		60	abs_conf = Configuration.objects.get(pk=id_conf)
		61	abs_conf.absmodule_status()
		62
		63	return

apps/abs/templates/abs_conf.html +8 0

             </style>
+            {% if status_request %}
+                <img id="loading" src="{% static 'images/loader.gif' %}">
+            {% endif %}
             {% if beams %}
             {% endfor %}
+            {% if status_request %}
+                setTimeout("location.href = '{% url 'url_abs_conf' dev_conf.id %}'",53000);
+            {% endif %}
             });
             </script>
             {% endblock %}

apps/abs/urls.py +1 0

                 url(r'^(?P<id_conf>-?\d+)/$', views.abs_conf, name='url_abs_conf'),
                 url(r'^(?P<id_conf>-?\d+)/edit/$', views.abs_conf_edit, name='url_edit_abs_conf'),
                 url(r'^(?P<id_conf>-?\d+)/import/$', views.import_file, name='url_import_abs_conf'),
+                url(r'^(?P<id_conf>-?\d+)/status/', views.abs_conf, {'status_request':True},name='url_status_abs_conf'),
                 url(r'^(?P<id_conf>-?\d+)/change_beam/(?P<id_beam>-?\d+)/$', views.send_beam, name='url_send_beam'),
                 url(r'^(?P<id_conf>-?\d+)/plot/$', views.plot_patterns, name='url_plot_abs_patterns'),
                 url(r'^(?P<id_conf>-?\d+)/plot/(?P<id_beam>-?\d+)/$', views.plot_patterns, name='url_plot_abs_patterns'),

apps/abs/views.py +12 -2

-            def abs_conf(request, id_conf):
+            def abs_conf(request, id_conf, status_request=None):
                 conf           = get_object_or_404(ABSConfiguration, pk=id_conf)
                 beams          = ABSBeam.objects.filter(abs_conf=conf)
                 kwargs['color_status']   = color_status
                 kwargs['module_messages'] = module_messages
-                #kwargs['only_stop'] = True
+                #if conf.device.status in [0,1]:
+                if conf.connected_modules() == 0:
+                    messages.error(request, 'No ABS module is connected.')#conf.message)
+                else:
+                    messages.success(request, 'ABS modules are connected.')#conf.message)
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(conf=conf))
+                if status_request:
+                    conf.status_device()
+                    kwargs['status_request'] = True
+                    return render(request, 'abs_conf.html', kwargs)
                 return render(request, 'abs_conf.html', kwargs)
             def abs_conf_edit(request, id_conf):
                 conf     = get_object_or_404(ABSConfiguration, pk=id_conf)

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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