From fe9ea6f8f3f07ca2248da6a9296591d672bf1d3e Mon Sep 17 00:00:00 2001
From: Alfredo Chissotti <20033498@studenti.uniupo.it>
Date: Fri, 15 Jul 2022 10:21:57 +0200
Subject: [PATCH] fixed no scenario active
---
.../bin/utility/Esecutore.class | Bin 6902 -> 6909 bytes
.../bin/utility/SubscribeCallback.class | Bin 7817 -> 7838 bytes
.../bin/utility/UserChangeSync.class | Bin 1351 -> 1931 bytes
ScenariMicroservizio/res/CONF/esecutore.json | 2 +-
ScenariMicroservizio/res/db-scenari/none | 1 +
.../src/utility/Esecutore.java | 6 +++---
.../src/utility/SubscribeCallback.java | 2 +-
.../src/utility/UserChangeSync.java | 2 +-
webapp/public/js/scenari.js | 6 +++---
9 files changed, 10 insertions(+), 9 deletions(-)
create mode 100644 ScenariMicroservizio/res/db-scenari/none
diff --git a/ScenariMicroservizio/bin/utility/Esecutore.class b/ScenariMicroservizio/bin/utility/Esecutore.class
index 2c473e7e0dbf696f74b1a21cf6f7f2de2af8e25e..6ae463a6f1f9ba980e095ee57b2896312012d4df 100644
GIT binary patch
delta 2308
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
Z@)m1NS!;*2rm2(V2Ft!cJ1L9s{{V7G^bi05
delta 2331
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
F@INxq@3Q~^
diff --git a/ScenariMicroservizio/bin/utility/SubscribeCallback.class b/ScenariMicroservizio/bin/utility/SubscribeCallback.class
index 819675171f3de7c9b278eb15d0baf0c47540e081..5e462acfd5f3be7719e2fb7371cf6c026eb3ff7a 100644
GIT binary patch
delta 883
zcmYk3TSydP7>2)h*KO9-Qg>b4gIk+YrePLBprzPNbS}c|d>Gep9n+a@cGSw$?0nAp
zJ6c%~6a)p87z7zXbWssh1l@TXbX|19`sVMVnBkd!-v9l+@BL?v)(qA7UXDK=C8Ao~
zxbN%D@q4ielwp{L=0gx$vawYR<P?TgP)<6b8LFk5<*IG#ou+~WXr`E*S1dl|Ji+#x
zw{kJ5!-r0EDcG4!CD<i~^Pbmtg8~WDFtl`9=eF^bW~J3kc+msOGqkRFJMXATtvZf)
zoaH{ygl5ZZui$k*$YZ4v&T>D?$&_w7>x1I8Kh$>^RA5_rGO1Zk)3|EbdUJ<mn@;ni
zAUB-FaXyYMt4?x|7S(8K(~V?Y>(mUJM>>|%ASG?9e+$oWD(TXeX{u##sCiB*0m|ww
zYICHbYV>$<J_d3*)ffN&G?>+zHVrQ>i@kxOjH{q&;%#8E7|&DO3Wmg+KqVT5E5FLq
zM1Ush^5>#ibmf;SNwi4icK#h!RtHzs>-<;zlrc_a3RUo(u|`2_Q6an9(C&D7e;T>?
zBFcO~Q~V7hRC=FZfM%voZY(D+tzgA~NiJv)zXY>f+#jL$(8Y&PD^j8^9ONVo;eOUX
zhAUamj)a0KZZUydETV<XyL8W)D5@eo?0OU_Vb@q>1}om^DpuA<iwm3zFS*&jgsWUM
zN>81ULPVFcV=Ov_XZ?-_Cvt9lCJzTB)QYKv5roD3!e^niWy4f3f_2rNu;&FW4toOF
zI6{d*;fu}6+&n_B)|LmbO)Q9oxZQ@>#@JW-M!)Gh6#9Vz`iT<yg*kAc25ye`E;hZd
z5&uFh;#h9%;E*m@Nb|Fia$)nac1!M&?3LUrxli(d<RQr;lE)-ZNS=}$kUT4SPV$07
SKQ3XA2l;r&6<ou03jYD@ZO4KD
delta 878
zcmYk2+e=hY6vo$@i!+U*qjP4`xjEAaT8at@L54vDB4!pu7-;2j<~WWy=S=5}TA7;N
zwX5!~mcH~51cp+~Ll1@!J(O?#0YyE8^w3KWnP#oMArdyfv(MV!x4ymhO#N8B<K6nJ
z1pwHMGxLsNm)(J0Y<J>OHsuO#K91lrVu~v3Nv%rGWRm@w4Q00E`hv+Pa|M`hI52~K
zHtcsoIS#Oe!Z)eY2vST_RmCupnyN(7if+i8(2j!$g{m?TNzsX%Q0gKWiBNe6A*V~%
zQZ=+6L9puS7~hUkIgw6ke1CyjX7pqtq3FC_q*sx3mAAaazPp2-D+p%fzhelNjBs3I
zVX64g4FsE!kuw@UyhZWdvKsGInz^0Qck%cMgxtZX=oqcTAv-bz6W8C}I6GGN7@BIw
z`)pi_;uM>eDlCr?O4yuK!d4_Vb}*-Br?nFhW30)u1LJJev(2Vpm#EBpo>8UUdtgg~
zp4ttTb*QjG4K2%I8+J#7r0T&FLc8Sk`{JZ>fQh&t?9f8>UQB@rV=w-Ab4}DLxA+4l
z*vI0YB9%mTFhc`0LK9ggV3G@2hi{a0pMAB}JW>Kn-X0soe?tM0)+)3hx8{(gk<2ET
zh36uFuYZV)i~e#7SoUwFR_?$-s>A}N8^W5%Wr78GEyAV)`$(}I2$%l54nOBz`=FmI
z0Pqu7X(qs0RvGkTK5Gar<~3KmgrY1Ssk8d5Z&^509c|0P`_?K6kNI-=j?VKctFrJk
zi_v+yE}vZswS~UHPxt{Vum-=-39A@{H7r9DZbvg+`)jCdq*aXf|7Fam34a<-(zg=|
zP^WQE37!!=D>y88PVl_oMZwF0R|UrfuM6H3ye&8>c!$%C_wWG)IVj{IKEi46{RJ0z
B!)O2i
diff --git a/ScenariMicroservizio/bin/utility/UserChangeSync.class b/ScenariMicroservizio/bin/utility/UserChangeSync.class
index 3a198509ded45c834a1aaf705e06cdae3162d60d..c90d08be2cc69ace9a1b603a50717abd66647d4e 100644
GIT binary patch
delta 878
zcmaJ;U2hUW6g|TNOIEa&rW#(1B()I?-L%G_Qd=z+O9iS@!M0i*V5D2tUECdreK0)v
zqKS#w7ySkLsEML!6JIqx_*eV|H4YzAOdB62_s%)@o;ml<H|52U^5ggRR{%56J}5<3
zQ^t7$|0ZovRWsG3rZWW>5tlLT$0f`V40pIX*K~EMxXDV~COBfT$92tOS<}eYb)8`R
zbh=ZfQ=`%=i--3^K3paUOiZX2v(<7jYM1iNpq8cvgrhk>5(p6-e?+S+VHzdM3mV@L
zna!!eZ3QvR`{6;7V07@k9Je&15)bDU1hC*o3X4v|wG$>#=AV>UjcY<e#%+R;zjLOR
z`izW%qf66Gf}?Y$$!%`YT88lrvuqD}aaX}TtjoCHHur#FY;R1>XqZ)|c3<!MP0|uK
ztu2DrgZ_GjUC{+<lyzp0rA@P1uf_X2YF2tmdr(FFr*nC$#s<mW*lT@>12^B3NKjqR
zX`ID<C=z&xVH!;Qd&)4FmC&heuQIVB0iD`6;6c7+R0vM|zm&k+9nyIxg*?|mkam7b
zCrQTnB?aXymO99g`&cL=e%~u@zz9OPftzq44G<sP0ta3>N%vyrT+ki#v@rPwXCfbQ
zSZZOo9d{60X~!?PPzcO!;|lN@S6jID7Khq+RHPB<6XZw><3Z1Rq31%z`R<-we~Kuc
zLB(@S;w7eVOK_u*c5zn5l#JLeQk_KPIYD_v<1+G)aHk`(f>jZH!uXmv6eV#}L{`Q_
HY#{gt(n0R4
delta 274
zcmW-b%Syvg6h&8><OZ%0QL&g=BIqDcLaSiaqz|=Kt8>Ry3P!{he4yYTIP;GD0;dWZ
zP{FC-PxuE;99O)}Xs>-X`<!z-@hRok-`fXJWA8~G6r^N|s>=$is%gH@IcyrZ$KA_r
zl=h=`deSqHt*gV{;5_Z0o;hqO*P1nU)Vvj|S39uRFo@N+?HkFR@SGa;eBg^>kmxf)
zJD4V*L6ZWpcE4JM)*H1iI#u7ZJUgR&PceLE+{~C9sgbe#z}N^&8bk91C(Kyz>_=TK
ukf<L~ZyZr#K*R-QuBouDvl+}Giw+fsjUh`pXm069=wh2~{Zl7jvilDqgfm3|
diff --git a/ScenariMicroservizio/res/CONF/esecutore.json b/ScenariMicroservizio/res/CONF/esecutore.json
index 1c19960..b77a9e1 100644
--- a/ScenariMicroservizio/res/CONF/esecutore.json
+++ b/ScenariMicroservizio/res/CONF/esecutore.json
@@ -1 +1 @@
-{"scenario-attivo":""}
+{"scenario-attivo":"scenario-2022-07-13T15-37-31.602719.json"}
diff --git a/ScenariMicroservizio/res/db-scenari/none b/ScenariMicroservizio/res/db-scenari/none
new file mode 100644
index 0000000..18d1307
--- /dev/null
+++ b/ScenariMicroservizio/res/db-scenari/none
@@ -0,0 +1 @@
+This file is used to remember that the user chose not to activate any scenario
\ No newline at end of file
diff --git a/ScenariMicroservizio/src/utility/Esecutore.java b/ScenariMicroservizio/src/utility/Esecutore.java
index 27698f0..70f03f4 100644
--- a/ScenariMicroservizio/src/utility/Esecutore.java
+++ b/ScenariMicroservizio/src/utility/Esecutore.java
@@ -19,7 +19,7 @@ public class Esecutore extends Thread {
private final Automa automa;
private final Scenari scenari;
- private final String DB_FOLDER = Scenari.RES_FOLDER + "db-scenari/";
+ final String DB_FOLDER = Scenari.RES_FOLDER + "db-scenari/";
private File scenarioAttivo = null;
private final ArrayList<File> filesRead = new ArrayList<File>();
private boolean isDonePublishing = false;
@@ -137,8 +137,8 @@ public class Esecutore extends Thread {
// System.out.println(waitingTime);
if (waitingTime > 1000) {
System.out.println("will sleep for "+waitingTime/1000);
- // Thread.sleep(waitingTime);
- wait(waitingTime);
+ Thread.sleep(waitingTime);
+// wait(waitingTime);
}
// System.out.println("running...");
diff --git a/ScenariMicroservizio/src/utility/SubscribeCallback.java b/ScenariMicroservizio/src/utility/SubscribeCallback.java
index f865662..609156d 100644
--- a/ScenariMicroservizio/src/utility/SubscribeCallback.java
+++ b/ScenariMicroservizio/src/utility/SubscribeCallback.java
@@ -244,7 +244,7 @@ public class SubscribeCallback implements MqttCallback{
// invio lo scenario attivo
if(antifurto) {
String scenarioAttivo = esec.getScenarioAttivo();
- if(scenarioAttivo != null) {
+ if(scenarioAttivo != null && !scenarioAttivo.equals("none")) {
JSONObject scenarioValori = new JSONObject();
System.out.println(scenarioAttivo);
scenarioValori.put("nome", scenarioAttivo.substring(0,28));
diff --git a/ScenariMicroservizio/src/utility/UserChangeSync.java b/ScenariMicroservizio/src/utility/UserChangeSync.java
index e6c7e70..e0592d4 100644
--- a/ScenariMicroservizio/src/utility/UserChangeSync.java
+++ b/ScenariMicroservizio/src/utility/UserChangeSync.java
@@ -39,7 +39,7 @@ public class UserChangeSync {
if(scenarioAttivo != null && scenarioAttivo.equals(scenNome)) {
//in questo caso sto disabilitando lo scenario attivo
esec.setLoopCondition(false);
- esec.setScenarioAttivo(null);
+ esec.setScenarioAttivo(new File(esec.DB_FOLDER+"none"));
} else {
//attivo lo scenario scelto dall'utente
esec.setScenarioAttivo(scen);
diff --git a/webapp/public/js/scenari.js b/webapp/public/js/scenari.js
index 953f1bd..7b3b6a5 100644
--- a/webapp/public/js/scenari.js
+++ b/webapp/public/js/scenari.js
@@ -481,7 +481,7 @@ class Scenari {
* @param {Boolean} activating true if the scenario should be activated, false otherwise
*/
static toggleScenario(scenarioID, activating,fromServer = false) {
- // HERE server deactivate the active scenario
+ // HERE ok server deactivate the active scenario
console.log({scenarioID,activating,fromServer},Scenari.scenarioAttivoToggle);
/*if(Scenari.scenarioAttivoToggle != null && !fromServer){
const scenarioAttivoID = Scenari.scenarioAttivoToggle.id.substring(Scenari.scenarioAttivoToggle.id.indexOf('-') + 1);
@@ -491,7 +491,7 @@ class Scenari {
return;
}*/
- // HERE server toggle the scenario
+ // HERE ok server toggle the scenario
const scenario = Scenari.scenariBucket.filter(sc => sc.id === scenarioID)[0];
if(!fromServer){
Scenari.setScenarioStatusServer(scenario, activating);
@@ -587,7 +587,7 @@ class Scenari {
* @see Scenari.mostraNuovoScenario
*/
static fillTable() {
- // HERE server get all scenarios
+ // HERE ok server get all scenarios
try {
if(!Api.isConnected){
setTimeout(Scenari.fillTable, 2500);
--
GitLab