added 2 more options

ICRAR · Oct 19, 2021 · 92d9ed3 · 92d9ed3
1 parent 8916c55
commit 92d9ed3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/daliuge-translator/dlg/dropmake/web/main.js b/daliuge-translator/dlg/dropmake/web/main.js
@@ -81,14 +81,38 @@ function makeJSON() {
     });
 }
 
- function physicalGraphTemplateToUploadHelper () {
-   $("#physicalGraphTemplateToUpload").click()
+ function LogicalGraphToUploadHelper () {
+   $("#LogicalGraphToUpload").click()
  }
 
+ function physicalGraphTemplateToUploadHelper () {
+  $("#physicalGraphTemplateToUpload").click()
+}
+
+function physicalGraphToUploadHelper () {
+  $("#physicalGraphToUpload").click()
+}
+
+$("#LogicalGraphToUpload").change(function() {
+  var props=$('#LogicalGraphToUpload').prop('files'),
+  file=props[0]
+  console.log('A LogicalGraphToUpload file has been selected')
+  console.log(file.name)
+  console.log(file.size)
+})
+
 $("#physicalGraphTemplateToUpload").change(function() {
   var props=$('#physicalGraphTemplateToUpload').prop('files'),
   file=props[0]
-  console.log('A file has been selected')
+  console.log('A physicalGraphTemplateToUpload file has been selected')
+  console.log(file.name)
+  console.log(file.size)
+})
+
+$("#physicalGraphToUpload").change(function() {
+  var props=$('#physicalGraphToUpload').prop('files'),
+  file=props[0]
+  console.log('A physicalGraphToUpload file has been selected')
   console.log(file.name)
   console.log(file.size)
 })

diff --git a/daliuge-translator/dlg/dropmake/web/pg_viewer.html b/daliuge-translator/dlg/dropmake/web/pg_viewer.html
@@ -101,7 +101,9 @@
                             </span>
                             <span id="exportJsonBtn" class="dropdown-item dropDropDownParent" href="#">Load <img id="exportJsonIcon" src="/static/src/icons/arrow_right_white_24dp.svg" alt="">
                                 <div class="dropDropDown">
-                                    <a id="json_button" class="dropdown-item" onclick="physicalGraphTemplateToUploadHelper()">Physical Graph Template</a>
+                                    <a class="dropdown-item" onclick="LogicalGraphToUploadHelper()">Logical Graph</a>
+                                    <a class="dropdown-item" onclick="physicalGraphTemplateToUploadHelper()">Physical Graph Template</a>
+                                    <a class="dropdown-item" onclick="physicalGraphToUploadHelper()">Physical Graph</a>
                                 </div>
                             </span>
                             <div class="dropdown-divider"></div>
@@ -120,7 +122,9 @@
     <div id="main"></div>
     <div id="SVGArea"></div>
     <div style="display:none;">
+        <input id="LogicalGraphToUpload" type="file" name="file">
         <input id="physicalGraphTemplateToUpload" type="file" name="file">
+        <input id="physicalGraphToUpload" type="file" name="file">
     </div>
     <div id="runinfoWrapper">
         <span id="runinfo" >{{partition_info}}</span>