From eefc2c0cec407398475b9f5d37803cfa112b2703 Mon Sep 17 00:00:00 2001
From: Eric Fayolle <eric.fayolle@edf.fr>
Date: Thu, 21 Oct 2021 19:19:27 +0200
Subject: [PATCH] connectEficas for fancyTree

---
 testFlask/connectEficas.py           |  2 +-
 testFlask/mdm.py                     |  8 +++-
 testFlask/templates/base.html        |  2 +-
 testFlask/templates/commandes_2.html | 61 ++++++++++++++++++++++++++--
 4 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/testFlask/connectEficas.py b/testFlask/connectEficas.py
index ba4b21fe..8fcba2af 100644
--- a/testFlask/connectEficas.py
+++ b/testFlask/connectEficas.py
@@ -133,7 +133,7 @@ if __name__ == "__main__":
     #print ( 'voici le connecteur', monEficasConnecteur)
     #print ( 'et les commandes', monEficasConnecteur.getListeCommandes(),'\n')
 
-    monEficasConnecteur.litFichierComm('../WebTest/web_tres_simple_avec_2Procs.comm')
+    monEficasConnecteur.litFichierComm('../WebTest/web_tres_simple_avec_2Fact.comm')
     d=monEficasConnecteur.getDicoForFancy(monEficasConnecteur.monEditeur.tree.racine)
     pprint.pprint(d)
     print ('\n')
diff --git a/testFlask/mdm.py b/testFlask/mdm.py
index e78ddd83..a93abc7e 100755
--- a/testFlask/mdm.py
+++ b/testFlask/mdm.py
@@ -108,8 +108,11 @@ def index():
 
     monConnecteur.litFichierComm('../WebTest/web_tres_simple_avec_2Fact.comm')
     myTreeDico=monConnecteur.getDicoObjetsCompletsPourTree(monConnecteur.monEditeur.tree.racine)
+    myFancyTreeDico=monConnecteur.getDicoForFancy(monConnecteur.monEditeur.tree.racine)
     
     myTreeJS=json.dumps([myTreeDico])
+    myFancyTreeJS=json.dumps([myFancyTreeDico])
+    
     # myNewTreeDico=OrderedDict([('text', 'MonProc2'), ('nodes', OrderedDict([('text', 'MonProc22'), ('nodes', [{'text': 'param1 1.0'}, [OrderedDict([('text', 'Fact1'), ('nodes', [{'text': 'param3 43.0'}])]), OrderedDict([('text', 'Fact1'), ('nodes', [{'text': 'param3 44.0'}])])]])]))])
     # myNewTreeJS=json.dumps([myNewTreeDico])
     print("---- myTreeDico : ")
@@ -118,6 +121,8 @@ def index():
     print("---- tree4Fancy     : ", tree4Fancy)
     # print("---- myNewTreeDico : ", myNewTreeDico)
     # print("---- myNewTreeJS : ", myNewTreeJS)
+    print("---- myFancyTreeDico : ", myFancyTreeDico)
+    print("---- myFancyTreeJS : ", myFancyTreeJS)
 
     return render_template('commandes_2.html',
       titre=code,
@@ -125,7 +130,8 @@ def index():
       profondeur=4,
       mcTraite={'MonProc2': {'s1': ('I', 2), 'F2': {'s2': ('I', 3), 'F3': {'s3': ('I', 4)}}}},
       mcTraiteJson=json.dumps(mcTraite),
-      tree=tree4Fancy,
+      tree=myFancyTreeJS,
+      # tree=tree4Fancy,
       # tree=myTreeJS
       # tree='['+myTreeJS+']'
     )
diff --git a/testFlask/templates/base.html b/testFlask/templates/base.html
index 0e296d63..18948288 100644
--- a/testFlask/templates/base.html
+++ b/testFlask/templates/base.html
@@ -60,7 +60,7 @@
     };
    
     $(function(){
-      $("#tree1").fancytree({
+      $("#tree10").fancytree({
         extensions: ["dnd5", "edit", "glyph", "wide"],
         checkbox: true,
         selectMode: 3,
diff --git a/testFlask/templates/commandes_2.html b/testFlask/templates/commandes_2.html
index b66e8151..db112f2b 100644
--- a/testFlask/templates/commandes_2.html
+++ b/testFlask/templates/commandes_2.html
@@ -96,8 +96,25 @@
       </div>
 
 
-       <script>
+    <!-- <style type="text/css"> -->
+    <!--   #treetable { -->
+    <!--   table-layout: fixed; -->
+    <!--   } -->
+    <!--   #treetable tr td:nth-of-type(1) { -->
+    <!--   text-align: right; -->
+    <!--   } -->
+    <!--   #treetable tr td:nth-of-type(2) { -->
+    <!--   text-align: center; -->
+    <!--   } -->
+    <!--   #treetable tr td:nth-of-type(3) { -->
+    <!--   min-width: 100px; -->
+    <!--   white-space: nowrap; -->
+    <!--   overflow: hidden; -->
+    <!--   text-overflow: ellipsis; -->
+    <!--   } -->
+    <!-- </style> -->
 
+    <script>
 	 
 function getTree1() {
   // Some logic to retrieve, or generate tree structure
@@ -109,9 +126,47 @@ function getTree2() {
 return  {{ mcTraiteJson|tojson }};
 }
 
-<!-- $("#tree1").fancytree({ source: [ {title: "Node 1", key: "1"},{title: "Folder 2", key: "2", folder: true, children: [ {title: "Node 2.1", key: "3"},{title: "Node 2.2", key: "4"} ]}    ], }) -->
+<!-- $('#tree1').treeview({ data: getTree1() }) -->
+
+<!-- $("#tree1").fancytree({ source: [ {title: "Node 1", key: "1000"},{title: "Folder 2", key: "2", folder: true, children: [ {title: "Node 2.1", key: "3000"},{title: "Node 2.2", key: "44"} ]}    ], })  -->
+
+<!-- $("#tree1").fancytree({ source: JSON.parse(getTree1()), }) -->
 
-$("#tree10").fancytree({ source: JSON.parse(getTree1()), })
+
+    var glyph_opts = {
+      preset: "bootstrap3",
+      map: {
+      }
+    };
+   
+    $(function(){
+      $("#tree1").fancytree({
+        extensions: ["dnd5", "edit", "glyph", "wide"],
+        checkbox: true,
+        selectMode: 3,
+        dnd5: {
+           dragStart: function(node, data) { return true; },
+           dragEnter: function(node, data) { return true; },
+           dragDrop: function(node, data) { data.otherNode.copyTo(node, data.hitMode); }
+      },
+      glyph: glyph_opts,
+      source: JSON.parse(getTree1()),
+      //wide: {
+      //  iconWidth: "1em",       // Adjust this if @fancy-icon-width != "16px"
+      //  iconSpacing: "0.5em",   // Adjust this if @fancy-icon-spacing != "3px"
+      //  labelSpacing: "0.1em",  // Adjust this if padding between icon and label != "3px"
+      //  levelOfs: "1.5em"       // Adjust this if ul padding != "16px"
+      //},
+      icon: function(event, data){
+        if( data.node.isFolder() ) {
+           return "glyphicon glyphicon-book";
+        }
+      },
+      //lazyLoad: function(event, data) {
+      //  data.result = {url: "ajax-sub2.json", debugDelay: 1000};
+      //}
+     });
+    });
 
          <!-- var $searchableTree = $('#tree1').treeview({ -->
          <!-- data: getTree1() -->
-- 
2.39.2