+
-
-
+
+
+
+
+
+
+ | # Amp |
+ Potencia (kW) |
+
+
+ | P1 |
+ |
+
+
+ | P2 |
+ |
+
+
+ | P3 |
+ |
+
+
+ | P4 |
+ |
+
+
+
+
-
+
{% endblock %}
\ No newline at end of file
diff --git a/apps/atrad/templates/atrad_tx.html b/apps/atrad/templates/atrad_tx.html
new file mode 100644
index 0000000..4b6fa99
--- /dev/null
+++ b/apps/atrad/templates/atrad_tx.html
@@ -0,0 +1,136 @@
+{% extends "base.html" %}
+{% load static %}
+{% block title %}ATRAD Tx{{id_tx}} Temperatures{% endblock %}
+{% block content-title %}{{title}}{% endblock %}
+{% block content-suptitle %}Tx {{id_tx}}{% endblock %}
+
+{% block extra-head %}
+
+{% endblock %}
+
+{% block content-graph %}
+
+
+
+
+
+
+
+
+
+
Controllers and combiners
+
+
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/apps/atrad/templates/prueba.html b/apps/atrad/templates/prueba.html
new file mode 100644
index 0000000..19750d5
--- /dev/null
+++ b/apps/atrad/templates/prueba.html
@@ -0,0 +1,28 @@
+{% extends "dev_conf.html" %}
+{% load static %}
+
+
+{% block content-graph %}
+
+
The queryset object:
+{{ mymembers }}
+
+
Last time {{last}}
+
+
+
+
+ {% for key in keys %}
+ | {{key}} |
+ {% endfor %}
+
+ {% for data in temps %}
+
+ {% for key in keys %}
+ | {{data|attr:key }} |
+ {% endfor %}
+
+ {% endfor %}
+
+{% endblock %}
+
diff --git a/apps/atrad/urls.py b/apps/atrad/urls.py
index 2774385..bc97e12 100644
--- a/apps/atrad/urls.py
+++ b/apps/atrad/urls.py
@@ -3,6 +3,8 @@ from django.urls import path
from . import views
urlpatterns = (
+ path('prueba/', views.atrad_prueba, name='url_prueba'),
path('
/', views.atrad_conf, name='url_atrad_conf'),
path('/edit/', views.atrad_conf_edit, name='url_edit_atrad_conf'),
+ path('//', views.atrad_tx, name='url_tx_atrad'),
)
\ No newline at end of file
diff --git a/apps/atrad/views.py b/apps/atrad/views.py
index 80c6355..a65da20 100644
--- a/apps/atrad/views.py
+++ b/apps/atrad/views.py
@@ -1,9 +1,10 @@
from django.shortcuts import redirect, render, get_object_or_404
from django.contrib import messages
from django.http import HttpResponse
+from django.template.loader import get_template
from apps.main.models import Experiment
-from .models import ATRADConfiguration
+from .models import ATRADConfiguration, ATRADData
from .forms import ATRADConfigurationForm, UploadFileForm
from apps.main.views import sidebar
@@ -15,7 +16,7 @@ import os
from django.http import JsonResponse
from .mqtt import client as mqtt_client
from radarsys.socketconfig import sio as sio
-
+from datetime import timedelta
def atrad_conf(request, id_conf):
@@ -38,12 +39,27 @@ def atrad_conf(request, id_conf):
kwargs['button'] = 'Edit Configuration'
#kwargs['no_play'] = True
-
###### SIDEBAR ######
kwargs.update(sidebar(conf=conf))
return render(request, 'atrad_conf.html', kwargs)
+def atrad_tx(request, id_conf, id_tx):
+ kwargs = {}
+ kwargs['id_tx'] = id_tx[-1]
+ kwargs['keys'] = ['id','temp1','temp2','temp3','temp4','temp5','temp6']
+ kwargs['title'] = 'Temperature Details'
+ kwargs['button'] = 'Edit Configuration'
+ time = ATRADData.objects.last().datetime
+ mydata = ATRADData.objects.filter(datetime__gte = (time-timedelta(minutes=20)),nstx=1).values_list('datetime','temp1','temp2','temp3','temp4','temp5','temp6')
+ kwargs['data'] = QuerytoStr(mydata)
+ return render(request, 'atrad_tx.html', kwargs)
+
+def QuerytoStr(data):
+ time = data[0]
+ strdata = str(time)
+ return strdata
+
def atrad_conf_edit(request, id_conf):
conf = get_object_or_404(ATRADConfiguration, pk=id_conf)
@@ -72,9 +88,6 @@ def atrad_conf_edit(request, id_conf):
return render(request, 'atrad_conf_edit.html', kwargs)
-import os
-from django.http import HttpResponse#
-
def publish_message(request):
rc, mid = mqtt_client.publish('test/data2',1)
return JsonResponse({'code1': 'HIKA', 'code2': 'LUCAS'})
@@ -83,9 +96,17 @@ def monitor(request):
kwargs = {'no_sidebar': True}
return render(request, 'monitor.html', kwargs)
-def prueba(request):
- kwargs = {'no_sidebar': True}
- return render(request, 'prueba.html', kwargs)
+def atrad_prueba(request):
+ keys = ['id','temp1','temp2','temp3','temp4','temp5','temp6']
+ time = ATRADData.objects.last().datetime
+ mydata = ATRADData.objects.filter(datetime__gte = (time-timedelta(hours=1))).values('id','temp1','temp2','temp3','temp4','temp5','temp6')
+ template = get_template('prueba.html')
+ context = {
+ 'last' : time,
+ 'temps': mydata,
+ 'keys' : keys,
+ }
+ return HttpResponse(template.render(context, request))
@sio.on('connection-bind')
def atrad_connection_bind(sid, data):
@@ -97,12 +118,4 @@ def atrad_disconnect(sid):
@sio.event
def atrad_control_event(sid,message):
- mqtt_client.publish('test/data2',message['data'])
-
-def hello(data):
- try:
- rc, mid = mqtt_client.publish('test/data2', 'Hello')
- sio.emit('test', data={'topic':mid, 'status': 'Not Running'})
- except:
- print('ERROR', flush=True)
- return HttpResponse("Hello")
\ No newline at end of file
+ mqtt_client.publish('test/data2', json.dumps(message))
diff --git a/apps/jars/models.py b/apps/jars/models.py
index a253208..663a083 100644
--- a/apps/jars/models.py
+++ b/apps/jars/models.py
@@ -291,7 +291,6 @@ class JARSConfiguration(Configuration):
self.device.status = payload['status']
self.device.save()
self.message = payload['message']
- print("------STOP JARS------",flush=True)
except Exception as e:
self.device.status = 0
self.message = str(e)
@@ -318,11 +317,8 @@ class JARSConfiguration(Configuration):
if self.device.status == 3:
self.message = 'Could not configure device. Software Acquisition is running'
+ print('Could not configure device. Software Acquisition is running')
return False
-
- print("------ JARS WRITING ------",flush=True)
- self.device.status = 5 #Busy
- print("STATUS:", self.device.status,flush=True)
data = self.experiment.parms_to_dict()
#print(data)
@@ -349,14 +345,12 @@ class JARSConfiguration(Configuration):
self.device.save()
if self.device.status == 1:
return False
- print("------ JARS WRITED ------",flush=True)
except Exception as e:
self.device.status = 0
self.message = str(e)
self.device.save()
return False
- print("FINAL STATUS:", self.device.status,flush=True)
return True
def start_device(self):
@@ -375,7 +369,6 @@ class JARSConfiguration(Configuration):
self.message = str(e)
self.device.save()
return False
- print("------START JARS------",flush=True)
return True
def get_log(self):
diff --git a/apps/main/management/commands/hello.py b/apps/main/management/commands/hello.py
index 8c96945..037f444 100644
--- a/apps/main/management/commands/hello.py
+++ b/apps/main/management/commands/hello.py
@@ -12,7 +12,7 @@ from apps.main.models import Experiment, Configuration
class Command(BaseCommand):
"""
- Restart experiment every night at 05:00 am.
+ Restart experiment_number every night at 05:00 am.
Example:
manage.py restart_experiment
"""
@@ -35,13 +35,38 @@ class Command(BaseCommand):
else:
radar=campaign.get_experiments_by_radar(radar=None)
- radar_id=radar[0]["id"]
- if campaign.experiments.all()[0].status !=1:
- print(campaign.name, "\t\t Stopping Campaign...")
- a=radar_stop_scheduler(campaign.id,radar_id,campaign.experiments.all()[0].id)
- print("New Status: ", a)
- else:
- print(campaign.name,"\t\t\t Campaign already stooped")
+ # print(campaign.name)
+ for rad in radar:
+ radar_id=rad["id"]
+ # print(radar_id, " ", rad["name"])
+ for exp in range(len(rad["experiments"])):
+ experiment=rad["experiments"][exp]
+ experiment_id= experiment.id
+ if experiment.status!=1:
+ print("Stopping Campaign {}, located on {}, the experiment {} with ID {}".format(campaign.name,rad["name"],experiment.name,experiment.id))
+ status=radar_stop_scheduler(campaign.id,radar_id,experiment.id)
+ if status == 0:
+ print("ERROR, status= {}".format(status))
+ # print("New Status: ", status)
+ else:
+ print("{} Experiment of the Campaign {} already stooped".format(experiment.name,campaign.name))
+ print("\n")
+
+ # radar_id=radar[0]["id"]
+ # if campaign.experiments.all()[0].status !=1:
+ # print(campaign.name, "\t\t Stopping Campaign...")
+ # a=radar_stop_scheduler(campaign.id,radar_id,campaign.experiments.all()[0].id)
+ # print("New Status: ", a)
+ # else:
+ # print(campaign.name,"\t\t\t Campaign already stooped")
+
+
+# EXP_STATES = (
+# (0,'Error'), #RED
+# (1,'Cancelled'), #YELLOW
+# (2,'Running'), #GREEN
+# (3,'Scheduled'), #BLUE
+# (4,'Unknown'), #WHITE
def radar_write_start_scheduler(id_camp,id_radar):
campaign = get_object_or_404(Campaign, pk=id_camp)
@@ -54,6 +79,8 @@ def radar_write_start_scheduler(id_camp,id_radar):
# print(exp)
if exp.status == 2:
print('\t\t\t {} \t\t Experiment already runnnig'.format(exp))
+ elif exp.status==5:
+ print('Experiment {} busy'.format(exp))
else:
exp.status = exp.start()
if exp.status == 0:
diff --git a/apps/main/models.py b/apps/main/models.py
index 4c8494b..4406b5b 100644
--- a/apps/main/models.py
+++ b/apps/main/models.py
@@ -425,6 +425,9 @@ class Experiment(models.Model):
Configure and start experiments's devices
ABS-CGS-DDS-RC-JARS
'''
+ self.status=5 #Busy
+ self.save()
+ # print("Guardando STATUS: {}".format(self.status))
confs = []
allconfs = Configuration.objects.filter(experiment=self, type = 0).order_by('-device__device_type__sequence')
@@ -437,18 +440,32 @@ class Experiment(models.Model):
else:
confs = allconfs
- print("confs: ",confs)
- #try:
+
for conf in confs:
- print("conf->",conf)
- conf.stop_device()
- conf.write_device()
+ print(conf.device)
+ print(conf.device.status)
+ print("--------------",flush=True)
+ print("Stop ",conf.name,flush=True)
+ if conf.stop_device() ==False:
+ print("Falló Stop ",conf.name)
+ print("Cancelando Campaña...",flush=True)
+ return 0
+ print("Write ",conf.name,flush=True)
+ if conf.write_device() ==False:
+ print("Falló Write ",conf.name)
+ print("Cancelando Campaña...",flush=True)
+ return 0
+ print("Save",conf.name,flush=True)
conf.device.conf_active = conf.pk
conf.device.save()
- conf.start_device()
+ print("Start",conf.name,flush=True)
+ if conf.start_device()==False:
+ print("Falló Start ",conf.name)
+ print("Cancelando Campaña...",flush=True)
+ return 0
+ print("--- CONFIGURACIÓN EXITOSA ---",flush=True)
time.sleep(1)
- #except:
- #return 0
+
return 2
diff --git a/apps/main/static/css/bootstrap.css b/apps/main/static/css/bootstrap.css
index 680e768..b5a2bd4 100644
--- a/apps/main/static/css/bootstrap.css
+++ b/apps/main/static/css/bootstrap.css
@@ -5733,7 +5733,7 @@ button.list-group-item-danger.active:focus {
}
.panel-default > .panel-heading {
color: #333;
- background-color: #f5f5f5;
+ background-color: #ffffff;
border-color: #ddd;
}
.panel-default > .panel-heading + .panel-collapse > .panel-body {
diff --git a/apps/main/static/js/prueba.js b/apps/main/static/js/prueba.js
new file mode 100644
index 0000000..0754a2e
--- /dev/null
+++ b/apps/main/static/js/prueba.js
@@ -0,0 +1,128 @@
+$(document).ready(function() {
+ var socket = io.connect('http://' + document.domain + ':' + location.port);
+
+ socket.on('connect', function(data) {
+ console.log('Connecting... OK');
+ makePlot("plot-temp",2,["T1","T2"],[14, 45])
+ makePlot("plot-pot",2,["T1","T2"],[70,100])
+ makePlot("plot-pot-t1",4,["P1","P2","P3","P4"],[0,26])
+ makePlot("plot-pot-t2",4,["P1","P2","P3","P4"],[0,26])
+ $("#temp-info-1").hide();
+ $("#temp-info-2").hide();
+ })
+
+ socket.on('test', function(data) {
+ let total = data.pow.reduce((a, b) => a + b, 0);
+ var id = (data.num/4)>>0;
+ streamPlot("plot-pot",data.time,total/1000.0,id,81);
+ streamPlot("plot-temp",data.time,data.tmax[0],id,40);
+ if(id == 0){
+ streamPlot2("plot-pot-t1",data.time,data.pow);
+ ligthStatus('status1','status-text1',data.status);
+ PotenciaAmplificador(['#pot1-1','#pot1-2','#pot1-3','#pot1-4'],data.pow);
+ $('#temp-1').text(data.tmax[0]);
+ if(eval(data.tmax[0])>30){
+ $("#temp-info-1").show();
+ $("#temp-info-1").text("TX"+(id+1)+" - Amplificador " + data.tmax[1]);
+ }
+ else{$("#status-temp").hide();}
+ }
+ else if(id == 1){
+ streamPlot2("plot-pot-t2",data.time,data.pow);
+ ligthStatus('status2','status-text2',data.status);
+ PotenciaAmplificador(['#pot2-1','#pot2-2','#pot2-3','#pot2-4'],data.pow);
+ $('#temp-2').text(data.tmax[0]);
+ if(eval(data.tmax[0])>30){
+ $("#temp-info-2").show();
+ $("#temp-info-2").text("TX"+(id+1)+" - Amplificador " + data.tmax[1]);
+ }
+ else{$("#status-temp").hide();}
+ }
+ })
+ $('form#controlON').submit(function(event) {
+ socket.emit('control_event', {data: 1});
+ return false;
+ });
+ $('form#controlOFF').submit(function(event) {
+ socket.emit('control_event', {data: 0});
+ return false;
+ });
+ $('#plot1').on('show.bs.modal', function(){
+ PotenciaAmplificador(['pot1-1','pot1-2','pot1-3','pot1-4']);
+ });
+ $('#plot1').on('show.bs.modal', function(){
+ PotenciaAmplificador(['pot2-1','pot2-2','pot2-3','pot2-4']);
+ });
+ });
+
+ function makePlot(div, n=1, names=["", ""],ranges){
+ var plotDiv = document.getElementById(div);
+ var traces = [];
+ for (let i = 0; i < n; i++) {
+ traces.push({x: [], y: [],mode: 'lines', name: names[i]});
+ }
+ traces.push({x: [], y: [],mode: 'lines',line: {color:'rgb(219, 64, 82)',dash: 'dot',width: 2},name:"nominal",showlegend: false});
+ var yrange = ranges;
+ var layout = {
+ autosize: true,
+ font: {size: 12},
+ margin: { t: 10, b:50 },
+ xaxis: {
+ type: 'date'
+ },
+ yaxis: {
+ range: yrange,
+ },
+ };
+
+ Plotly.plot(plotDiv, traces, layout);
+ };
+
+ function streamPlot(div,x,y,ind,val){
+ var plotDiv = document.getElementById(div);
+ if (plotDiv.data[ind].x.length > 8){
+ plotDiv.data[2].x = plotDiv.data[2].x.slice(-23)
+ plotDiv.data[2].y = plotDiv.data[2].y.slice(-23)
+ plotDiv.data[ind].x = plotDiv.data[ind].x.slice(-11)
+ plotDiv.data[ind].y = plotDiv.data[ind].y.slice(-11)
+ }
+ var tm = [x];
+ var values = [y];
+ var data_update = {x: [tm,tm], y: [values,[val]]}
+ Plotly.extendTraces(plotDiv, data_update,[ind,2])
+ };
+ function streamPlot2(div,x,y){
+ var plotDiv = document.getElementById(div);
+ if (plotDiv.data[0].x.length > 8){
+ for(let i=0;i<4;i++){
+ plotDiv.data[i].x = plotDiv.data[i].x.slice(-11)
+ plotDiv.data[i].y = plotDiv.data[i].y.slice(-11)
+ }
+ }
+ var tm = [x];
+ var values = [];
+ for(let i=0;i<4;i++){
+ values[i]=[y[i]/1000.0];
+ }
+ var data_update = {x: [tm,tm,tm,tm], y: values}
+ Plotly.extendTraces(plotDiv, data_update,[0,1,2,3])
+ };
+ function ligthStatus(div1,div2,status){
+ if(status==='0000'){
+ document.getElementById(div1).style.backgroundColor = "red";
+ document.getElementById(div2).innerHTML = "Desabilitado";
+ }
+ else if(status==='1111'){
+ document.getElementById(div1).style.backgroundColor = "green";
+ document.getElementById(div2).innerHTML = "Habilitado";
+ }
+ else{
+ document.getElementById(div1).style.backgroundColor = "yellow";
+ document.getElementById(div2).innerHTML = "Incompleto";
+ }
+ }
+ function PotenciaAmplificador(div,data){
+ for(let i=0; i<4; i++){
+ $(div[i]).text(data[i]/1000.0);
+ }
+ }
\ No newline at end of file
diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index 332ee6d..b1909e1 100644
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -60,9 +60,9 @@
{% else %}
-
@@ -88,12 +88,11 @@
{% endfor %}
{% endif %}
{% endblock %}
-
- {% block content %}
- {% endblock %}
-
+ {% block content %}
+ {% endblock %}
-
+ {% block content-graph %}
+ {% endblock %}