Branchement de quelques signaux...

diff --git a/InterfaceWeb/browser.py b/InterfaceWeb/browser.py
index ca9a8c9e99f82b857859d863c5014faeb606ee07..75616e0e7a8b1a835fa81ffb494ff884c209e3f4 100644 (file)
--- a/InterfaceWeb/browser.py
+++ b/InterfaceWeb/browser.py
@@ -182,7 +182,7 @@ class JDCNode():
         if self.children[pos].item.nature == 'MCBLOC' : laListe=self.children[pos].item.getDicoForFancy()
         else : laListe=(self.children[pos].item.getDicoForFancy(),)
         self.editor.connecteur.toWebApp('appendChildren',self.getIdUnique(),laListe,pos)
-        #print (' appel appendChild',self.item.idUnique,laListe,pos)
+        print (' appel appendChild',self.item.idUnique,laListe,pos)
 
     def onSupp(self,suppression):
     #---------------------------

diff --git a/testFlask/connectEficas.py b/testFlask/connectEficas.py
index 8cc28a55f100c19d8d3aa0b395274199e847cd1a..385f3a10ed599e2da89691abb03f26d9665981c9 100644 (file)
--- a/testFlask/connectEficas.py
+++ b/testFlask/connectEficas.py
@@ -51,8 +51,9 @@ class accasConnecteur :
         self.appWeb=appWeb
 
     def toWebApp(self,fction,*args, **kwargs):
+        print ('self.appWeb.fromConnecteur', fction, *args, **kwargs)
+        print ('self.appWeb', self.appWeb)
         if self.appWeb == None : # test
-           #print ('self.appWeb.fromConnecteur', fction, *args, **kwargs)
            return
         self.appWeb.fromConnecteur(fction, *args, **kwargs)
         

diff --git a/testFlask/mdm.py b/testFlask/mdm.py
index 6e9750ba26f88aa2e995ea9ff44ff337025dc553..37e66afaad72f53e746ac6db5f20aaeeea307a44 100755 (executable)
--- a/testFlask/mdm.py
+++ b/testFlask/mdm.py
@@ -8,8 +8,8 @@ from flask import Flask, request, render_template, url_for, jsonify, make_respon
 # from flask import Flask, request, render_template, url_for, json, jsonify
 import json
 import pprint
-from   forms       import BasicForm
-from   collections import OrderedDict
+from   forms           import BasicForm
+from   collections   import OrderedDict
 from   markupsafe  import escape
 
 from flask_sse import sse
@@ -24,24 +24,47 @@ from flask_sse import sse
 #     """Flask subclass using the custom request class"""
 #     request_class = MyReq
 
-def createConnecteur():    
-    monConnecteur=accasConnecteur(code, langue='ang')
+def createConnecteur(app):    
+    monConnecteur=accasConnecteur(code, langue='ang',appWeb=app)
     return monConnecteur
 
-monConnecteur=createConnecteur()
+app = Flask(__name__)
+
+monConnecteur=createConnecteur(app)
 print (monConnecteur.getListeCommandes())
 
-app = Flask(__name__)
 #Server Side Event config
 app.config["REDIS_URL"] = "redis://localhost"
 #app.config["REDIS_URL"] = "redis://:password@localhost"
 #TODO: personaliser l'url en fonction de la session utilisateur
 app.register_blueprint(sse, url_prefix='/stream')
 
-@app.route('/update')
-def publish_update():
-    sse.publish({"message": "Hello!"}, type='update')
-    return "Message sent!"
+def fromConnecteur(maFonction,*args,**kwargs):
+  print ('dans propageValidefromConnecteur: ', maFonction)
+  fnct=globals()[maFonction]
+  fnct(*args,**kwargs)
+
+#TODO : Rattacher à une session
+#            gérer un appel register callback
+app.fromConnecteur=fromConnecteur
+
+def propageValide(id, valid):
+    print ('dans propageValide: ', id, valid)
+    sse.publish({"idUnique" : id, "valid":valid, "message": "Hello from propageValide!"}, type='propageValide')
+
+def appendChildren(id, nodeList, pos):
+    print ('dans appendChildren: ', nodeList, pos)
+    sse.publish({'id':id, 'nodeList':nodeList, 'pos':pos, "message": "Hello from appendChildren!"}, type='appendChildren')
+    
+def deleteChildren(idList):
+    print ('dans deleteChildren: ', idList)
+    sse.publish({"idList":idList,"message": "Hello from deleteChildren!"}, type='deleteChildren')
+    
+# # Pour test curl
+# @app.route('/update')
+# def publish_update():
+#     sse.publish({"message": "Hello!"}, type='update')
+#     return "Message sent!"
 
 @app.route('/')
 def index():

diff --git a/testFlask/templates/commandes_2.html b/testFlask/templates/commandes_2.html
index 933571628199ec580e1f92e4c00188f509d1b425..e7bd207a2d35850ec4a8ee24f95791036a97246d 100644 (file)
--- a/testFlask/templates/commandes_2.html
+++ b/testFlask/templates/commandes_2.html
@@ -133,8 +133,9 @@
 
     <script>
       
-    var source = new EventSource("{{ url_for('sse.stream') }}");
-    source.addEventListener('update', function(event) {
+   var source = new EventSource("{{ url_for('sse.stream') }}");
+      
+    source.addEventListener('propageValide', function(event) {
         var data = JSON.parse(event.data);
         alert("The server says " + data.message);
         var tree=$.ui.fancytree.getTree("#tree1");
@@ -144,7 +145,39 @@
         //  title: "Document using a custom icon",
         //  icon: "customdoc1.gif"
         //});
-    }, false);
+   }, false);
+
+    source.addEventListener('appendChildren', function(event) {
+        var data               = JSON.parse(event.data);
+        var id         = data.id;
+        var nodeList   = data.nodeList;
+        var pos                = data.pos;
+   
+        alert("The server says " + data.message);
+        var tree=$.ui.fancytree.getTree("#tree1");
+        var activeNode = tree.getActiveNode();
+        //p1=tree.getNodeByKey('8304986a334211ec853cac220bca9aa6')
+        //activeNode.addChildren({
+        //  title: "Document using a custom icon",
+        //  icon: "customdoc1.gif"
+        //});
+   }, false);
+
+     source.addEventListener('deleteChildren', function(event) {
+        var data               = JSON.parse(event.data);
+        var idList             = data.idList;
+   
+        alert("The server says " + data.message);
+        var tree=$.ui.fancytree.getTree("#tree1");
+        var activeNode = tree.getActiveNode();
+        //p1=tree.getNodeByKey('8304986a334211ec853cac220bca9aa6')
+        //activeNode.addChildren({
+        //  title: "Document using a custom icon",
+        //  icon: "customdoc1.gif"
+        //});
+   }, false);
+
+   
     source.addEventListener('error', function(event) {
         alert("Failed to connect to event stream. Is Redis running?");
     }, false);