From 9d79337fa704840675c96e908cf3d02b9a09479a Mon Sep 17 00:00:00 2001 From: Ziad-I <68874104+Ziad-I@users.noreply.github.com> Date: Fri, 26 Jul 2024 17:29:39 +0300 Subject: [PATCH] edit drawings html/css/js --- .../bim/data/webui/static/css/drawings.css | 13 +++++--- .../bim/data/webui/static/js/drawings.js | 31 ++++++++++++++++--- .../bim/data/webui/templates/drawings.html | 14 ++++----- 3 files changed, 42 insertions(+), 16 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/data/webui/static/css/drawings.css b/src/blenderbim/blenderbim/bim/data/webui/static/css/drawings.css index 2b91ee913e..df6da34a0e 100644 --- a/src/blenderbim/blenderbim/bim/data/webui/static/css/drawings.css +++ b/src/blenderbim/blenderbim/bim/data/webui/static/css/drawings.css @@ -199,7 +199,7 @@ nav ul li a.active { .right { background-color: var(--bg-color); - /* Light gray background for the right part */ + border: 1px solid var(--border-color); } .panel { @@ -207,15 +207,20 @@ nav ul li a.active { border: 1px solid var(--border-color); padding: 10px; flex-grow: 1; - /* Take the remaining space */ display: flex; flex-direction: column; } .card-header, -.card { +.card-body { background-color: var(--bg-color); border: 1px solid var(--border-color); + overflow: auto; +} + +.card { + background-color: var(--nav-bg-color); + overflow: auto; } #dropdown-menu:focus { @@ -231,5 +236,5 @@ nav ul li a.active { .btn, .btn:hover { - color: var(--text-color); + color: var(--nav-link-hover-color); } \ No newline at end of file diff --git a/src/blenderbim/blenderbim/bim/data/webui/static/js/drawings.js b/src/blenderbim/blenderbim/bim/data/webui/static/js/drawings.js index 151086de96..3733c4a0bb 100644 --- a/src/blenderbim/blenderbim/bim/data/webui/static/js/drawings.js +++ b/src/blenderbim/blenderbim/bim/data/webui/static/js/drawings.js @@ -1,5 +1,4 @@ -// keeps track of blenders connected in form of -// {shown:bool, filename:string, headers:array} +// keeps track of blenders connected const connectedClients = {}; let socket; @@ -21,12 +20,36 @@ function connectSocket() { console.log("socket: ", socket); // Register socket event handlers - // socket.on("blender_connect", handleBlenderConnect); - // socket.on("blender_disconnect", handleBlenderDisconnect); + socket.on("blender_connect", handleBlenderConnect); + socket.on("blender_disconnect", handleBlenderDisconnect); // socket.on("csv_data", handleCsvData); // socket.on("default_data", handleDefaultData); } +// Function to handle 'blender_connect' event +function handleBlenderConnect(blenderId) { + console.log("blender_connect: ", blenderId); + if (!connectedClients.hasOwnProperty(blenderId)) { + connectedClients[blenderId] = { + shown: false, + filename: "", + }; + } +} + +// Function to handle 'blender_disconnect' event +function handleBlenderDisconnect(blenderId) { + console.log("blender_disconnect: ", blenderId); + if (connectedClients.hasOwnProperty(blenderId)) { + delete connectedClients[blenderId]; + removeGanttElement(blenderId); + } + + $("#blender-count").text(function (i, text) { + return parseInt(text, 10) - 1; + }); +} + function setTheme(theme) { var stylesheet = $("#tabulator-stylesheet"); if (theme === "light") { diff --git a/src/blenderbim/blenderbim/bim/data/webui/templates/drawings.html b/src/blenderbim/blenderbim/bim/data/webui/templates/drawings.html index 8e97678a13..b6b26dc441 100644 --- a/src/blenderbim/blenderbim/bim/data/webui/templates/drawings.html +++ b/src/blenderbim/blenderbim/bim/data/webui/templates/drawings.html @@ -61,18 +61,18 @@
-
+
-
+
    @@ -85,10 +85,10 @@ data-toggle="collapse" data-target="#collapseTwo" > - Sub-panel 2 + Sheets
    -
    +
      @@ -98,9 +98,7 @@
      - -

      Right Part

      -

      This is the right part of the container.

      +