#1 further integration of ER diagram to main tool

CapsicoHealth · Sep 13, 2023 · 79de0be · 79de0be
1 parent 18b0f36
commit 79de0be
Show file tree

Hide file tree

Showing 7 changed files with 484 additions and 398 deletions.
diff --git a/WebContent/index.html b/WebContent/index.html
@@ -38,8 +38,14 @@
       <DIV id="ENTITY_LIST"><IMG src="/static/img/progress.gif"></DIV>
     </DIV>
     <DIV id="EDITORS" class="column right"  style="top:75px; bottom:75px; left:20%; overflow-x:hidden; overflow-y:auto; scrollbar-width:thin;">
+<!--
       <textarea id="EDITOR" wrap="off" style="tab-size:4; width:98%; height:98%;"></textarea >
-    </DIV>
+-->
+      <DIV id="ER_EDITOR" style="position: relative; width:98%; height:98%;">
+         <button id="ER_EDITOR_ADD_CANVAS_BUTTON">Add New Canvas</button>
+         <div id="ER_EDITOR_CANVAS_TABS"></DIV>
+         <div id="ER_EDITOR_CANVAS_CONTAINER"></div>
+      </DIV>
   </MAIN>
 
   <FOOTER id="MAINCONTAINER_FOOTER">
@@ -52,10 +58,16 @@
 
 </div>
 
-<script src="https://cdn.jsdelivr.net/npm/monaco-editor@latest/min/vs/loader.js"></script>
+<scriptX src="https://cdn.jsdelivr.net/npm/monaco-editor@latest/min/vs/loader.js"></scriptX>
+<script src="/static/jslibs/jquery/3.6.0/jquery.min.js"></script>
+<script src="/static/jslibs/lodash.js/4.17.21/lodash.min.js"></script>
+<script src="/static/jslibs/backbone.js/1.4.0/backbone-min.js"></script>
+<script src="/static/jslibs/jointjs/3.4.2/joint.min.js"></script>
+<script src="/static/js/joint.shapes.uml.js"></script>
 
 <SCRIPT type="module">
 import { projects } from "/static/js/module-projects.js";
+
 window.TILDA_GLOBAL = {
   addProject: function()
     {

diff --git a/WebContent/static/css/tilda.css b/WebContent/static/css/tilda.css
@@ -2576,3 +2576,15 @@ table.centered {
 
 
 
+.canvas {
+   position: relative;
+   width: 90%;
+   height: 90%;
+   border: 1px solid grey;
+   background-color: #DDD;
+}
+
+.canvas-container {
+   border: 1px solid grey;
+   background-color: #DDD;
+}
diff --git a/WebContent/static/js/er.html b/WebContent/static/js/er.html
@@ -70,6 +70,10 @@
           border: 1px solid grey;
           background-color: #DDD;
         }
+        .canvas-container {
+          border: 1px solid grey;
+          background-color: #DDD;
+        }
     </style>
 </head>
 <body>

diff --git a/WebContent/static/js/er.js b/WebContent/static/js/er.js
@@ -758,6 +758,7 @@ $(document).ready(function() {
         canvasStateManager.removeEntity(activeCanvasID,entityName);
         updateShelfDisplay();
     }
+
     canvasData = {}
     var contextMenu = $('<ul>', { class: 'context-menu' }).appendTo(document.body);