radarsys_met Commit - r199:e81d0045e464

Task #714: Modulo ABS...

Fiorella Quino -

r199:e81d0045e464

parent child

Context file:

r199:e81d0045e464

Collapse all files

apps/abs/models.py +75 -44

                      module = 'ABS_'+str(module_num)
                      bs  = '' #{}
                      i=1
-                     #beams  = {1: '001000', 2: '010001', 3: '010010', 4: '000011', 5: '101100', 6: '101101',
-                     #       7: '110110', 8: '111111', 9: '000000', 10: '001001', 11: '010010', 12: '011011'}
                      for beam in beams:
                          #bs[i] = fromBinary2Char(beam.module_6bits(module_num))
                          bs = bs + fromBinary2Char(beam.module_6bits(module_num))
                      beams = bs
                      parameters = {}
-                     parameters['header'] = header
-                     parameters['module'] = module
+                     #parameters['header'] = header
+                     #parameters['module'] = module
                      parameters['beams']  = beams #json.dumps(beams)
-                     print parameters['beams']
+                     #print beams
+                     #print parameters['beams']
+                     print parameters
                      answer = ''
                      try:
-                         r_write = requests.post(write_route, parameters, timeout=0.5)
+                         #r_write = requests.post(write_route, parameters, timeout=0.5)
+                         r_write = requests.post(write_route, json = parameters, timeout=0.5)
                          answer  = r_write.json()
                          self.message = answer['message']
                      except:
                          return 0
                      return 1
+                 def write_device(self):
+                     """
+                     This function sends the beams list to every abs module.
+                     It needs 'module_conf' function
+                     """
+                     beams = ABSBeam.objects.filter(abs_conf=self)
+                     #-------------Write each abs module-----------
+                     if beams:
+                         beams_status = ast.literal_eval(self.module_status)
+                         for i in range(61,64): #(62,65)
+                             try:
+                                 answer = self.module_conf(i, beams)
+                                 beams_status[str(i)] = 1
+                                 self.module_status = json.dumps(beams_status)
+                                 self.save()
+                             except:
+                                 beams_status[str(i)] = 0
+                                 self.module_status = json.dumps(beams_status)
+                                 self.save()
+                                 answer = 0
+                                 return 0
+                     else:
+                         self.message = "ABS Configuration does not have beams"
+                         return 0
+                     #self.device.status = 1
+                     ##
+                     if answer==1:
+                         self.message = "ABS Beams List have been sent to ABS Modules"
+                         beams[0].set_as_activebeam()
+                     else:
+                         self.message = "Could not read ABS parameters"
+                     ##
+                     self.save()
+                     return 1
                  def read_module(self, module):
                      """
                          module_bits    = answer['allbits']
                      except:
                          #message = "Could not read ABS parameters"
+                         answer  = r_write.json()
                          return 0
                      return module_bits
-                 def read_module(self, module):
-                     return True
-                 def status_device(self):
+                 def absmodule_status(self):
                      """
                      This function gets the status of each abs module. It sends GET method to Web Application
                      in Python Bottle.
+                     This function updates "module_status" field from ABSconfiguration.
                      """
                      ip_address  = self.device.ip_address
                      ip_address  = ip_address.split('.')
                              modules_status[str(i)] = 0
                              pass
-                     self.message = 'ABS modules Status have been updated.'
                      self.module_status=json.dumps(modules_status)
                      self.save()
                      return
-                 def write_device(self):
+                 def connected_modules(self):
                      """
-                     This function sends the beams list to every abs module.
-                     It needs 'module_conf' function
+                     This function returns the number of connected abs-modules without updating.
                      """
+                     modules_status = json.loads(self.module_status)
+                     num = 0
+                     for status in modules_status:
+                         num = num +modules_status[status]
-                     beams = ABSBeam.objects.filter(abs_conf=self)
+                     return num
-                     #-------------Write each abs module-----------
-                     if beams:
-                         beams_status = ast.literal_eval(self.module_status)
-                         for i in range(61,64): #(62,65)
-                             try:
-                                 answer = self.module_conf(i, beams)
-                                 beams_status[str(i)] = 1
-                                 self.module_status = json.dumps(beams_status)
-                                 self.save()
-                             except:
-                                 beams_status[str(i)] = 0
-                                 self.module_status = json.dumps(beams_status)
-                                 self.save()
-                                 answer = 0
-                                 return 0
-                     else:
-                         self.message = "ABS Configuration does not have beams"
-                         return 0
+                 def status_device(self):
+                     """
+                     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()
+                     connected_modules = self.connected_modules()
+                     if connected_modules>0:
+                         self.message = 'ABS modules Status have been updated.'
+                         return 1
+                     self.message = 'No ABS module is connected.'
+                     return 0
-                     #self.device.status = 1
-                     ##
-                     if answer==1:
-                         self.message = "ABS Beams List have been sent to ABS Modules"
-                         beams[0].set_as_activebeam()
-                     else:
-                         self.message = "Could not read ABS parameters"
-                     ##
-                     self.save()
-                     return 1
                  def write_module(self, module):

apps/abs/templates/abs_conf.html +21 -22

              }
              .north tr{
                  border: 1px solid #ffffff;
              }
              .north td{
                  border: 2px solid #e2e2e7;
                    {% endfor %}
                  </ul>
                  <div class="tab-content">
                    <div id="home" class="tab-pane fade in active">
                      <!---->
                      {% if active_beam %}
-                     <h3>Active Beam: {{active_beam.name}}</h3>
+                     <h3>Active Beam: {{active_beam.name}}</h3>
                        <table id="abs_pattern" class="abs">
                          <tr>
                        </table>
                        <table class="legend">
                          <tr>
                            <th colspan="2">Legend</th>
                          </tr>
                          <tr>
-                           <td style="color:#ff0000;"><i>RED</i></td><td>Disconnected</td>
+                           <td class="text-danger"><i>RED</i></td><td>Disconnected</td>
                          </tr>
                          <tr>
-                           <td style="color:#ee902c;"><i>ORANGE</i></td><td>Connected</td>
+                           <td class="text-warning"><i>ORANGE</i></td><td>Connected</td>
                          </tr>
                          <tr>
-                           <td style="color:#00cc00;"><i>GREEN</i></td><td>Running
-                           </td>
+                           <td class="text-success"><i>GREEN</i></td><td>Running   </td>
                          </tr>
                          <!--
                          <tr>
                          </tr>
                          -->
                        </table>
                        {% else %}
                    </div>
                    {% for beam in beams %}
                      <div id="menu{{forloop.counter}}" class="tab-pane fade">
                          Change Beam</button>
                        </div>
                        {% endif %}
                          {% if active_beam %}
                            {% if active_beam.id == beam.id %}
                                    <th colspan="2">Legend</th>
                                  </tr>
                                  <tr>
-                                   <td style="color:#ff0000;"><i>RED</i></td><td>Disconnected</td>
+                                   <td class="text-danger"><i>RED</i></td><td>Disconnected</td>
                                  </tr>
                                  <tr>
-                                   <td style="color:#ee902c;"><i>ORANGE</i></td><td>Connected</td>
+                                   <td class="text-warning"><i>ORANGE</i></td><td>Connected</td>
                                  </tr>
                                  <tr>
-                                   <td style="color:#00cc00;"><i>GREEN</i></td><td>Running
+                                   <td class="text-success"><i>GREEN</i></td><td>Running
                                    </td>
                                  </tr>
                                </table>
                              {% endif %}
                            {% endif %}
                      </div>
                    {% endfor %}
                  </div>
                </div>
              {% for beam in beams %}
                $("#send_beam{{forloop.counter}}").click(function() {
                    document.location = "{% url 'url_send_beam' dev_conf.id beam.id %}";
-               });
+               });
              {%endfor%}
              });
              </script>

apps/abs/views.py +7 -7

                  color_status   = {}
                  for status in modules_status:
-                     if modules_status[status] == 2:    #Running background-color: #ff0000;
-                         color_status[status] = 'bgcolor=#00cc00'
+                     if modules_status[status] == 2:    #Running background-color: #00cc00;
+                         color_status[status] = 'class=text-success'#'bgcolor=#00cc00'
                      elif modules_status[status] == 1:  #Connected background-color: #ee902c;
-                         color_status[status] = 'bgcolor=#ee902c'
-                     else:                              #Disconnected background-color: #00cc00;
-                         color_status[status] = 'bgcolor=#FF0000'
+                         color_status[status] = 'class=text-warning'#'bgcolor=#ee902c'
+                     else:                              #Disconnected background-color: #ff0000;
+                         color_status[status] = 'class=text-danger'#'bgcolor=#FF0000'
                  #------------------------------------------------
                  kwargs = {}
-                 kwargs['status'] = conf.device.get_status_display()
+                 #kwargs['status'] = conf.device.get_status_display()
+                 kwargs['connected_modules'] = str(conf.connected_modules())+'/64'
                  kwargs['dev_conf'] = conf
                  kwargs['dev_conf_keys'] = ['name',]

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