radarsys_met Commit - r205:2b52673784ab

Task #769: Implementacion Scheduler para ABS, Task #717: Implementacion de start_device() y stop_device()...

Fiorella Quino -

r205:2b52673784ab

parent child

Context file:

r205:2b52673784ab

Collapse all files

apps/abs/models.py +40 -2

             from apps.main.models import Configuration
             from django.core.urlresolvers import reverse
             # Create your models here.
+            from celery.execute import send_task
+            from datetime import datetime
             import ast
             import socket
             import json
                     active_beam = json.loads(self.active_beam)
                     new_beams = ABSBeam.objects.filter(abs_conf=self)
                     active_beam['active_beam'] = new_beams[0].id
                     self.active_beam = json.dumps(active_beam)
                     self.save()
                     #-----For Active Beam-----
+                    #-----For Device Status---
+                    self.device.status = 3
+                    self.device.save()
+                    #-----For Device Status---
                     return self
+                def start_device(self):
+                    if self.device.status == 3:
+                        try:
+                            #self.write_device()
+                            send_task('task_change_beam', [self.id],)
+                            self.message = 'ABS running'
+                        except Exception as e:
+                            self.message = str(e)
+                            return False
+                        return True
+                    else:
+                        self.message = 'Please, select Write ABS Device first.'
+                        return False
+                def stop_device(self):
+                    self.device.status = 2
+                    self.device.save()
+                    self.message = 'ABS has been stopped.'
+                    self.save()
+                    return True
                 def module_conf(self, module_num, beams):
                     """
                     This function creates beam configurations for one abs module.
                     #-------------Jueves-------------
                     if disconnected_modules == 64:
                         self.message = "Could not write ABS Modules"
+                        self.device.status = 0
                         return False
                     else:
                         self.message = "ABS Beams List have been sent to ABS Modules"
                         beams[0].set_as_activebeam()
+                    self.device.status = 3
                     self.module_status = json.dumps(beams_status)
-                    self.save()
                     self.save()

apps/abs/tasks.py +5 -14

             from datetime import timedelta, datetime
             from celery.task import task
-            """
+            @task(name='task_change_beam')
-            @task
-            def beam_task(id_conf):
-                abs_conf  = Configuration.objects.get(pk=id_conf)
-                task_change_beam(abs_conf.pk)
-                return task_change_beam(abs_conf.pk)
-            """
-            @task
             def task_change_beam(id_conf):
                 abs_conf = Configuration.objects.get(pk=id_conf)
                 now = datetime.utcnow()
                 date = now + run_every
+                if abs_conf.device.status != 3:
+                    return abs_conf.device.status
                 if abs_conf.operation_mode == 0:  #Manual Mode
                     return 1
                         abs_conf.send_beam_num(1)
                         beams_list[0].set_as_activebeam()
                         task = task_change_beam.apply_async((abs_conf.pk,), eta=date)
-                        print next_beam
+                        print beams_list[0]
                         i=0
                 else:

apps/abs/views.py +3 -3

             from time import sleep
             import os
-            from apps.main.models import Device, Configuration
+            from apps.main.models import Device, Configuration, Experiment
             from apps.main.views import sidebar
             from .models import ABSConfiguration, ABSBeam
                 kwargs['title'] = 'ABS Configuration'
                 kwargs['suptitle'] = 'Details'
-                kwargs['no_play'] = True
+                #kwargs['no_play'] = True
                 kwargs['button'] = 'Edit Configuration'
                 #------------------Active Beam-----------------------
                 kwargs['color_status']   = color_status
                 kwargs['module_messages'] = module_messages
-                kwargs['only_stop'] = True
+                #kwargs['only_stop'] = True
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(conf=conf))

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