Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-23 21:58:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

See #3603. Base64 encode gantt chart JSON data to prevent JSON parsing problems.

Browse Source
This commit is contained in:
Dion Moult
2023-08-18 22:19:15 +10:00
parent 8464fc86a4
commit 130355f915
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/data/gantt/index.mustache
+2 -2
View File
@@ -51,5 +51,5 @@ var json_data = `{{{json_data}}}`;
<script> <script>
var data = `{{{data}}}`; var data = `{{{data}}}`;
setupPage(data); setupPage(data);
create_gantt_chart(json_data) create_gantt_chart(atob(json_data))
</script> </script>
src/blenderbim/blenderbim/tool/sequence.py
+9 -10
View File
@@ -16,15 +16,19 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with BlenderBIM Add-on. If not, see <http://www.gnu.org/licenses/>. # along with BlenderBIM Add-on. If not, see <http://www.gnu.org/licenses/>.
import bpy
import re
import os import os
import re
import bpy
import json
import base64
import pystache
import mathutils
import webbrowser
import ifcopenshell import ifcopenshell
import ifcopenshell.util.sequence import ifcopenshell.util.sequence
import ifcopenshell.util.date import ifcopenshell.util.date
import ifcopenshell.util.element import ifcopenshell.util.element
import ifcopenshell.util.unit import ifcopenshell.util.unit
import json
import blenderbim.core.tool import blenderbim.core.tool
import blenderbim.core import blenderbim.core
import blenderbim.tool as tool import blenderbim.tool as tool
@@ -32,9 +36,6 @@ import blenderbim.bim.helper
import blenderbim.bim.module.sequence.helper as helper import blenderbim.bim.module.sequence.helper as helper
from dateutil import parser from dateutil import parser
from datetime import datetime from datetime import datetime
import mathutils
import pystache
import webbrowser
class Sequence(blenderbim.core.tool.Sequence): class Sequence(blenderbim.core.tool.Sequence):
@@ -378,7 +379,6 @@ class Sequence(blenderbim.core.tool.Sequence):
@classmethod @classmethod
def get_task_time_attributes(cls): def get_task_time_attributes(cls):
def callback(attributes, prop): def callback(attributes, prop):
if "Start" in prop.name or "Finish" in prop.name or prop.name == "StatusTime": if "Start" in prop.name or "Finish" in prop.name or prop.name == "StatusTime":
if prop.is_null: if prop.is_null:
attributes[prop.name] = None attributes[prop.name] = None
@@ -1553,10 +1553,9 @@ class Sequence(blenderbim.core.tool.Sequence):
def generate_gantt_browser_chart(cls, task_json, work_schedule): def generate_gantt_browser_chart(cls, task_json, work_schedule):
with open(os.path.join(bpy.context.scene.BIMProperties.data_dir, "gantt", "index.html"), "w") as f: with open(os.path.join(bpy.context.scene.BIMProperties.data_dir, "gantt", "index.html"), "w") as f:
with open(os.path.join(bpy.context.scene.BIMProperties.data_dir, "gantt", "index.mustache"), "r") as t: with open(os.path.join(bpy.context.scene.BIMProperties.data_dir, "gantt", "index.mustache"), "r") as t:
task_b64 = base64.b64encode(bytes(json.dumps(task_json), "utf-8")).decode("utf-8")
f.write( f.write(
pystache.render( pystache.render(t.read(), {"json_data": task_b64, "data": json.dumps(work_schedule.get_info())})
t.read(), {"json_data": json.dumps(task_json), "data": json.dumps(work_schedule.get_info())}
)
) )
webbrowser.open("file://" + os.path.join(bpy.context.scene.BIMProperties.data_dir, "gantt", "index.html")) webbrowser.open("file://" + os.path.join(bpy.context.scene.BIMProperties.data_dir, "gantt", "index.html"))