diff --git a/plm_web_3d/controllers/main.py b/plm_web_3d/controllers/main.py index 2ce5a9cc..21e9e437 100755 --- a/plm_web_3d/controllers/main.py +++ b/plm_web_3d/controllers/main.py @@ -74,10 +74,11 @@ def getProductInfo(self, document_id): out["document"] = document for component in ir_attachment.linkedcomponents: components = """ -
  • Product Name: %s
  • +
  • Product Name: %s
  • Product Revision: %s
  • Description: %s
  • """ % ( + component.id, component.engineering_code, component.engineering_revision, component.name, diff --git a/plm_web_3d/static/src/css/OdooCADApplication.css b/plm_web_3d/static/src/css/OdooCADApplication.css index de70893f..46ca4cba 100644 --- a/plm_web_3d/static/src/css/OdooCADApplication.css +++ b/plm_web_3d/static/src/css/OdooCADApplication.css @@ -409,12 +409,12 @@ ul, #myUL { } /* Create the caret/arrow with a unicode, and style it */ -.caret::before { +/*.caret::before { content: "\25B6"; color: black; display: inline-block; margin-right: 6px; -} +}*/ /* Rotate the caret/arrow icon when clicked on (using JavaScript) */ .caret-down::before { diff --git a/plm_web_3d/static/src/js/OdooCADApplication.js b/plm_web_3d/static/src/js/OdooCADApplication.js index ccea40f1..cc2b6ca9 100644 --- a/plm_web_3d/static/src/js/OdooCADApplication.js +++ b/plm_web_3d/static/src/js/OdooCADApplication.js @@ -293,8 +293,12 @@ function init() { /* * Inizialize tree view search */ - var input_document_tree = document.getElementById('input_search_document_tree'); - //input_document_tree.addEventListener("keyup", OdooCad.search_document_tree); +// Commented the above as there is no id in the document with +// input_search_document_tree present. +// var input_document_tree = document.getElementById('input_search_document_tree'); + var input_document_list = document.getElementById('input_search_document_list'); + console.log(input_document_list); + input_document_list.addEventListener("keyup", OdooCad.search_document_tree); /* * function to hide show all components */ diff --git a/plm_web_3d/static/src/js/lib/odoocad/odoocad.js b/plm_web_3d/static/src/js/lib/odoocad/odoocad.js index a2f27b03..dc7af512 100644 --- a/plm_web_3d/static/src/js/lib/odoocad/odoocad.js +++ b/plm_web_3d/static/src/js/lib/odoocad/odoocad.js @@ -12,7 +12,7 @@ const odoo_hilight_color= new THREE.Color("#eda3da") var guid = () => { var w = () => { return Math.floor((1 + Math.random()) * 0x10000).toString(16).substring(1); } return `${w()}${w()}-${w()}-${w()}-${w()}-${w()}${w()}${w()}`;} - + class OdooCAD{ constructor(scene){ this.tree_ref_elements={} @@ -31,7 +31,7 @@ class OdooCAD{ * Get the bounding box of all the added mesh items */ getBBox(){ - + const box = new THREE.Box3(); var items = this.items; for (let i = 0; i < items.length; i=i+1) { @@ -43,7 +43,7 @@ class OdooCAD{ }; return box; } - + addItemToScene(object, force_material=true){ var self=this; /* @@ -75,9 +75,7 @@ class OdooCAD{ this.active_bbox=this.getBBox(); return out_htm_structure; } - // - - /// + set_str_name(span_element){ var guid_name = span_element.parentElement.attributes['webgl_ref_name'].value; var obj_3d = this.tree_ref_elements[guid_name] @@ -91,7 +89,7 @@ class OdooCAD{ xmlhttp.open("GET", url, true); xmlhttp.send(); } - + get_li_structure(object, nested=false){ var self = this; var found=false; @@ -102,7 +100,7 @@ class OdooCAD{ else{ out_lis='