Merge pull request #15 from Patent2net/4.0.0-dev2

fix design + bug
Patent2net · Jun 9, 2021 · 6f67a49 · 6f67a49
2 parents 319c984 + ba87729
commit 6f67a49
Show file tree

Hide file tree

Showing 7 changed files with 125 additions and 107 deletions.
diff --git a/Patent2Net/media/graph-recipes-v2/app/bundle.js b/Patent2Net/media/graph-recipes-v2/app/bundle.js
@@ -134096,6 +134096,9 @@ angular.module('graphrecipes.view_board', ['ngRoute'])
       $scope.easyscript = true
     } else {
       //Run default script
+      $scope.easy_recipe = null
+      $scope.esc = null
+      $scope.easyscript = false
       $scope.directRun = true
       $scope.executeScript($scope.settings.root+'/recipes/'+r.file)
     }
@@ -134135,7 +134138,11 @@ angular.module('graphrecipes.view_board', ['ngRoute'])
         })
       } else {
         codePromise = new Promise((resolve, reject) => {
-          resolve(window.editor.getValue())
+          if (!window.editor) {
+            resolve(null)
+          } else {
+            resolve(window.editor.getValue())
+          }
         })
       }
 

diff --git a/Patent2Net/media/graph-recipes-v2/app/easy_recipes_view/sigma/index.html b/Patent2Net/media/graph-recipes-v2/app/easy_recipes_view/sigma/index.html
@@ -1,25 +1,29 @@
-<div class="flex flex-row items-start">
-    <div class="mr-4 px-4 py-2 bg-indigo-600 rounded inline-block">
-      <p class="text-2xl font-bold text-white">Taille des noeuds</p>
-      <div>
-        <div class="my-2">
-          <p class="text-white font-bold">Faire varier en fonction de</p>
-          <easy-select-block select-block="$ctrl.esc.sizes"></easy-select-block>
-        </div>
-        <div class="my-2">
-          <p class="text-white font-bold">Taille min/max</p>
-          <easy-range-numbers range-numbers="$ctrl.esc.rangeSize"></easy-range-numbers>
+<div class="grid xl:grid-cols-2 gap-4">
+    <div>
+      <div class="mb-6 px-4 py-2 border rounded block">
+        <p class="text-2xl font-bold text-black">Taille des noeuds</p>
+        <div>
+          <div class="my-2">
+            <p class="text-black font-bold">Faire varier en fonction de</p>
+            <easy-select-block select-block="$ctrl.esc.sizes"></easy-select-block>
+          </div>
+          <div class="my-2">
+            <p class="text-black font-bold">Taille min/max</p>
+            <easy-range-numbers range-numbers="$ctrl.esc.rangeSize"></easy-range-numbers>
+          </div>
         </div>
       </div>
     </div>
 
-    <div class="mr-4 px-4 py-2 bg-indigo-600 rounded inline-block">
-      <p class="text-2xl font-bold text-white">Couleurs des noeuds</p>
-      <div class="py-2">
-        <easy-select-block select-block="$ctrl.esc.colorBy"></easy-select-block>
-      </div>
-      <div class="py-2">
-        <easy-colors colors="$ctrl.esc.colors" class="flex-1"></easy-colors>
+    <div>
+      <div class="mb-6 px-4 py-2 border rounded block">
+        <p class="text-2xl font-bold text-black">Couleurs des noeuds</p>
+        <div class="py-2">
+          <easy-select-block select-block="$ctrl.esc.colorBy"></easy-select-block>
+        </div>
+        <div class="py-2">
+          <easy-colors colors="$ctrl.esc.colors" class="flex-1"></easy-colors>
+        </div>
       </div>
     </div>
 

diff --git a/Patent2Net/media/graph-recipes-v2/app/view_board/board.js b/Patent2Net/media/graph-recipes-v2/app/view_board/board.js
@@ -81,6 +81,9 @@ angular.module('graphrecipes.view_board', ['ngRoute'])
       $scope.easyscript = true
     } else {
       //Run default script
+      $scope.easy_recipe = null
+      $scope.esc = null
+      $scope.easyscript = false
       $scope.directRun = true
       $scope.executeScript($scope.settings.root+'/recipes/'+r.file)
     }
@@ -120,7 +123,11 @@ angular.module('graphrecipes.view_board', ['ngRoute'])
         })
       } else {
         codePromise = new Promise((resolve, reject) => {
-          resolve(window.editor.getValue())
+          if (!window.editor) {
+            resolve(null)
+          } else {
+            resolve(window.editor.getValue())
+          }
         })
       }
 

diff --git a/Patent2Net/media/pivottable/ext/1519867293252.png b/Patent2Net/media/pivottable/ext/1519867293252.png
diff --git a/Patent2Net/media/pivottable/ext/1519952224793.png b/Patent2Net/media/pivottable/ext/1519952224793.png
diff --git a/Patent2Net/media/pivottable/ext/téléchargement.png b/Patent2Net/media/pivottable/ext/téléchargement.png
diff --git a/Patent2Net/templates/graph-recipes.html b/Patent2Net/templates/graph-recipes.html
@@ -35,93 +35,93 @@
   <script src="../../Patent2Net/media/graph-recipes-v2/app/bundle.js"></script>
   <script>
 
-    app(
-      {
-        "files": [
-            {
-                "name": "Applicant network",
-                "path": "./GephiFiles/{{request}}_ApplicantsJS.gexf"
-            },
-            {
-                "name": "Families Applicant network",
-                "path": "./GephiFiles/Families{{request}}_ApplicantsJS.gexf"
-            },
-            {
-                "name": "Inventor network",
-                "path": "./GephiFiles/{{request}}_InventorsJS.gexf"
-            },
-            {
-                "name": "Families Inventor network",
-                "path": "./GephiFiles/Families{{request}}_InventorsJS.gexf"
-            },
-            {
-                "name": "Applicants &amp; Inventors network",
-                "path": "./GephiFiles/{{request}}_ApplicantInventorJS.gexf"
-            },
-            {
-                "name": "FamiliesApplicants &amp; Inventors network",
-                "path": "./GephiFiles/Families{{request}}_ApplicantInventorJS.gexf"
-            },
-            {
-                "name": "Applicants and patent labels networks",
-                "path": "./GephiFiles/{{request}}_LabelApplicantsJS.gexf"
-            },
-            {
-                "name": "FamiliesApplicants and patent labels networks",
-                "path": "./GephiFiles/Families{{request}}_LabelApplicantsJS.gexf"
-            },
-            {
-                "name": "Technologies networks",
-                "path": "./GephiFiles/{{request}}_CrossTechJS.gexf"
-            },
-            {
-                "name": "Families Technologies networks",
-                "path": "./GephiFiles/Families{{request}}_CrossTechJS.gexf"
-            },
-            {
-                "name": "Inventors Technologies (CIB) network",
-                "path": "./GephiFiles/{{request}}_Inventors_CrossTechJS.gexf"
-            },
-            {
-                "name": "Families Inventors Technologies (CIB) network",
-                "path": "./GephiFiles/Families{{request}}_Inventors_CrossTechJS.gexf"
-            },
-            {
-                "name": "Applicants Technologies (CIB) network",
-                "path": "./GephiFiles/{{request}}_Applicants_CrossTechJS.gexf"
-            },
-            {
-                "name": "Families Applicants Technologies (CIB) network",
-                "path": "./GephiFiles/Families{{request}}_Applicants_CrossTechJS.gexf"
-            },
-            {
-                "name": "Citations network",
-                "path": "./GephiFiles/{{request}}_CitationsJS.gexf"
-            },
-            {
-                "name": "Families Citations network",
-                "path": "./GephiFiles/Families{{request}}_CitationsJS.gexf"
-            },
-            {
-                "name": "Equivalents network",
-                "path": "./GephiFiles/{{request}}_EquivalentsJS.gexf"
-            },
-            {
-                "name": "Families Equivalents network",
-                "path": "./GephiFiles/{{request}}_EquivalentsJS.gexf"
-            },
-            {
-                "name": "References network",
-                "path": "./GephiFiles/{{request}}_ReferencesJS.gexf"
-            },
-            {
-                "name": "Families References network",
-                "path": "./GephiFiles/{{request}}_ReferencesJS.gexf"
-            }
-        ],
-        "root": "../../Patent2Net/media/graph-recipes-v2/app"
-      }
-    )
+    setTimeout(() => {
+        app({
+            "files": [
+                {
+                    "name": "Applicant network",
+                    "path": "./GephiFiles/{{request}}_ApplicantsJS.gexf"
+                },
+                {
+                    "name": "Families Applicant network",
+                    "path": "./GephiFiles/Families{{request}}_ApplicantsJS.gexf"
+                },
+                {
+                    "name": "Inventor network",
+                    "path": "./GephiFiles/{{request}}_InventorsJS.gexf"
+                },
+                {
+                    "name": "Families Inventor network",
+                    "path": "./GephiFiles/Families{{request}}_InventorsJS.gexf"
+                },
+                {
+                    "name": "Applicants &amp; Inventors network",
+                    "path": "./GephiFiles/{{request}}_ApplicantInventorJS.gexf"
+                },
+                {
+                    "name": "FamiliesApplicants &amp; Inventors network",
+                    "path": "./GephiFiles/Families{{request}}_ApplicantInventorJS.gexf"
+                },
+                {
+                    "name": "Applicants and patent labels networks",
+                    "path": "./GephiFiles/{{request}}_LabelApplicantsJS.gexf"
+                },
+                {
+                    "name": "FamiliesApplicants and patent labels networks",
+                    "path": "./GephiFiles/Families{{request}}_LabelApplicantsJS.gexf"
+                },
+                {
+                    "name": "Technologies networks",
+                    "path": "./GephiFiles/{{request}}_CrossTechJS.gexf"
+                },
+                {
+                    "name": "Families Technologies networks",
+                    "path": "./GephiFiles/Families{{request}}_CrossTechJS.gexf"
+                },
+                {
+                    "name": "Inventors Technologies (CIB) network",
+                    "path": "./GephiFiles/{{request}}_Inventors_CrossTechJS.gexf"
+                },
+                {
+                    "name": "Families Inventors Technologies (CIB) network",
+                    "path": "./GephiFiles/Families{{request}}_Inventors_CrossTechJS.gexf"
+                },
+                {
+                    "name": "Applicants Technologies (CIB) network",
+                    "path": "./GephiFiles/{{request}}_Applicants_CrossTechJS.gexf"
+                },
+                {
+                    "name": "Families Applicants Technologies (CIB) network",
+                    "path": "./GephiFiles/Families{{request}}_Applicants_CrossTechJS.gexf"
+                },
+                {
+                    "name": "Citations network",
+                    "path": "./GephiFiles/{{request}}_CitationsJS.gexf"
+                },
+                {
+                    "name": "Families Citations network",
+                    "path": "./GephiFiles/Families{{request}}_CitationsJS.gexf"
+                },
+                {
+                    "name": "Equivalents network",
+                    "path": "./GephiFiles/{{request}}_EquivalentsJS.gexf"
+                },
+                {
+                    "name": "Families Equivalents network",
+                    "path": "./GephiFiles/{{request}}_EquivalentsJS.gexf"
+                },
+                {
+                    "name": "References network",
+                    "path": "./GephiFiles/{{request}}_ReferencesJS.gexf"
+                },
+                {
+                    "name": "Families References network",
+                    "path": "./GephiFiles/{{request}}_ReferencesJS.gexf"
+                }
+            ],
+            "root": "../../Patent2Net/media/graph-recipes-v2/app"
+        })
+    }, 100)
 
   </script>