diff --git a/resources/web/guide/21/21.css b/resources/web/guide/21/21.css index a6c5a6ae209..933f823080a 100644 --- a/resources/web/guide/21/21.css +++ b/resources/web/guide/21/21.css @@ -124,3 +124,31 @@ display: flex; justify-content:space-around; } + +.search { + width: 100%; + position: relative; + display: flex; + } + + .searchTerm { + width: 100%; + border: 3px solid #009688; + /*border-right: none;*/ + padding: 5px; + height: 20px; + border-radius: 5px 5px 5px 5px; + outline: none; + color: #9DBFAF; + } + + .searchTerm:focus{ + color: #009688; + } + + /*Resize the wrap to see the search bar change!*/ + .wrap{ + width: 30%; + padding-bottom: 5px; + padding-left: 42px; + } \ No newline at end of file diff --git a/resources/web/guide/21/21.js b/resources/web/guide/21/21.js index 0aaee3e2f5a..131420dbddb 100644 --- a/resources/web/guide/21/21.js +++ b/resources/web/guide/21/21.js @@ -40,7 +40,6 @@ function HandleStudio( pVal ) } } - function ShowPrinterThumb(pItem, strImg) { $(pItem).attr('src',strImg); @@ -52,7 +51,7 @@ function HandleModelList( pVal ) if( !pVal.hasOwnProperty("model") ) return; - let pModel=pVal['model']; + pModel=pVal['model']; let nTotal=pModel.length; let ModelHtml={}; @@ -99,7 +98,7 @@ function HandleModelList( pVal ) for(let m=0;m'+nNozzel+'mm nozzle'; + HtmlNozzel += '
'+nNozzel+'mm nozzle
'; } let CoverImage=OneModel['cover']; @@ -120,18 +119,20 @@ function HandleModelList( pVal ) for(let m=0;m' + + '
' + + '
' + + '
all
' + + '
none
' + + '
' + + ' ' + sVV + '' + + '
' + + '
' + + '
' + + ''; + + $('#Content').append(HtmlNewVendor); + } + + //Collect Html Node Nozzel Html + if (!ModelHtml.hasOwnProperty(strVendor)) + ModelHtml[strVendor] = ''; + + let NozzleArray = OneModel['nozzle_diameter'].split(';'); + let HtmlNozzel = ''; + for (let m = 0; m < NozzleArray.length; m++) { + let nNozzel = NozzleArray[m]; + HtmlNozzel += '
' + nNozzel + 'mm nozzle
'; + } + + let CoverImage = OneModel['cover']; + ModelHtml[strVendor] += '
' + + '
' + + '
' + OneModel['model'] + '
' + HtmlNozzel + '
'; + } + + //Update Nozzel Html Append + for (let key in ModelHtml) { + let obj = $(".OneVendorBlock[vendor='" + key + "'] .PrinterArea"); + obj.empty(); + obj.append(ModelHtml[key]); + } + + + //Update Checkbox + ModelSelect = $('input[type=checkbox]'); + for (let n = 0; n < ModelSelect.length; n++) { + let OneItem = ModelSelect[n]; + + let strModel = OneItem.getAttribute("model"); + let strVendor = OneItem.getAttribute("vendor"); + let strNozzel = OneItem.getAttribute("nozzel"); + + let checked = GetModelSelect(strVendor, strModel, strNozzel); + + OneItem.checked = checked; + } + + // let AlreadySelect=$("input:checked"); + // let nSelect=AlreadySelect.length; + // if(nSelect==0) + // { + // $("input[nozzel='0.4'][vendor='Custom']").prop("checked", true); + // } + + TranslatePage(); +} function SelectPrinterAll( sVendor ) { @@ -162,15 +312,54 @@ function SelectPrinterNone( sVendor ) } -// function GotoFilamentPage() { - let nChoose=OnExit(); + let nChoose=OnExitFilter(); if(nChoose>0) window.open('../22/index.html','_self'); } +function OnExitFilter() { + + let nTotal = 0; + let ModelAll = {}; + for (vendor in ModelNozzleSelected) { + for (model in ModelNozzleSelected[vendor]) { + for (nozzel in ModelNozzleSelected[vendor][model]) { + if (!ModelNozzleSelected[vendor][model][nozzel]) + continue; + + if (!ModelAll.hasOwnProperty(model)) { + //alert("ADD: "+strModel); + + ModelAll[model] = {}; + + ModelAll[model]["model"] = model; + ModelAll[model]["nozzle_diameter"] = ''; + ModelAll[model]["vendor"] = vendor; + } + + ModelAll[model]["nozzle_diameter"] += ModelAll[model]["nozzle_diameter"] == '' ? nozzel : ';' + nozzel; + + nTotal++; + } + + } + } + + var tSend = {}; + tSend['sequence_id'] = Math.round(new Date() / 1000); + tSend['command'] = "save_userguide_models"; + tSend['data'] = ModelAll; + + SendWXMessage(JSON.stringify(tSend)); + + return nTotal; + +} + +// function OnExit() { let ModelAll={}; diff --git a/resources/web/guide/21/index.html b/resources/web/guide/21/index.html index b6589ca79a1..a5163568bdd 100644 --- a/resources/web/guide/21/index.html +++ b/resources/web/guide/21/index.html @@ -19,6 +19,11 @@
Printer Selection
+
+ +