diff --git a/resources/web/guide/22/22.js b/resources/web/guide/22/22.js index 4b811d0452..abc887653d 100644 --- a/resources/web/guide/22/22.js +++ b/resources/web/guide/22/22.js @@ -2,16 +2,14 @@ var m_ProfileItem; var FilamentPriority=new Array( "pla","abs","pet","tpu","pc"); -var VendorPriority=new Array("Generic","Orca Built-in","bambu lab","bambulab","bbl","kexcelled","polymaker","esun"); +var VendorPriority=new Array("generic"); function OnInit() { TranslatePage(); RequestProfile(); - - //m_ProfileItem=cData; - //SortUI(); + } function RequestProfile() @@ -23,15 +21,6 @@ function RequestProfile() SendWXMessage( JSON.stringify(tSend) ); } -//function RequestModelSelect() -//{ -// var tSend={}; -// tSend['sequence_id']=Math.round(new Date() / 1000); -// tSend['command']="request_userguide_modelselected"; -// -// SendWXMessage( JSON.stringify(tSend) ); -//} - function HandleStudio(pVal) { let strCmd=pVal['command']; @@ -65,30 +54,6 @@ function SortUI() ModelList.push(OneMode); } - //machine -// let HtmlMachine=''; -// -// let nMachine=m_ProfileItem['machine'].length; -// for(let n=0;n'+sName+''; -// } -// } -// -// $('#MachineList .CValues').append(HtmlMachine); -// $('#MachineList .CValues input').prop("checked",true); -// if(nMachine<=1) -// { -// $('#MachineList').hide(); -// } - //model let HtmlMode=''; nMode=ModelList.length; @@ -112,6 +77,8 @@ function SortUI() var TypeHtmlArray={}; var VendorHtmlArray={}; + var GenericFilamentHtmlArray={}; + var NonGenericFilamentHtmlArray={}; for( let key in m_ProfileItem['filament'] ) { let OneFila=m_ProfileItem['filament'][key]; @@ -125,14 +92,6 @@ function SortUI() let fSelect=OneFila['selected']; let fModel=OneFila['models'] - //alert( fWholeName+' - '+fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel ); - -// if(OneFila['name'].indexOf("Bambu PA-CF")>=0) -// { -// alert( fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel ) -// -// let b=1+2; -// } let bFind=false; //let bCheck=$("#MachineList input:first").prop("checked"); @@ -195,7 +154,12 @@ function SortUI() /* ORCA use label tag to allow checkbox to toggle when user ckicked to text */ let HtmlFila=''; - $("#ItemBlockArea").append(HtmlFila); + // Separate generic and non-generic filaments + if(fVendor.toLowerCase() === 'generic') { + GenericFilamentHtmlArray[fShortName] = HtmlFila; + } else { + NonGenericFilamentHtmlArray[fShortName] = HtmlFila; + } } else { @@ -221,6 +185,14 @@ function SortUI() // $("#ItemBlockArea input[vendor='"+fVendor+"'][model='"+fModel+"'][filatype='"+fType+"'][name='"+key+"']").prop("checked",false); } } + + // Append filaments in order: generic first, then non-generic + for(let key in GenericFilamentHtmlArray) { + $("#ItemBlockArea").append(GenericFilamentHtmlArray[key]); + } + for(let key in NonGenericFilamentHtmlArray) { + $("#ItemBlockArea").append(NonGenericFilamentHtmlArray[key]); + } //Sort TypeArray let TypeAdvNum=FilamentPriority.length; diff --git a/resources/web/guide/22/index.html b/resources/web/guide/22/index.html index cf8e26e7d6..a23bfca06a 100644 --- a/resources/web/guide/22/index.html +++ b/resources/web/guide/22/index.html @@ -25,23 +25,6 @@
printer
-
@@ -49,35 +32,13 @@
filament type
-
vendor
- - +
@@ -87,59 +48,6 @@
Clear all
-
diff --git a/resources/web/guide/23/23.js b/resources/web/guide/23/23.js index 6b849ed323..f97ff4f38c 100644 --- a/resources/web/guide/23/23.js +++ b/resources/web/guide/23/23.js @@ -1,7 +1,7 @@ var m_ProfileItem; var FilamentPriority=new Array( "pla","abs","pet","tpu","pc"); -var VendorPriority=new Array("Generic","Orca Built-in","bambu lab","bambulab","bbl","kexcelled","polymaker","esun"); +var VendorPriority=new Array("generic"); function OnInit() { @@ -79,15 +79,30 @@ function SortUI() $('#MachineList').hide(); } - //Filament + //Filament - Create sorted array with generic vendor first + let FilamentArray=new Array(); + let GenericFilamentArray=new Array(); + for( let key in m_ProfileItem['filament'] ) + { + let OneFila=m_ProfileItem['filament'][key]; + if(OneFila['vendor'].toLowerCase() === 'generic') + GenericFilamentArray.push({key: key, data: OneFila}); + else + FilamentArray.push({key: key, data: OneFila}); + } + // Combine arrays with generic filaments first + let SortedFilamentArray = GenericFilamentArray.concat(FilamentArray); + let HtmlFilament=''; let SelectNumber=0; var TypeHtmlArray={}; var VendorHtmlArray={}; - for( let key in m_ProfileItem['filament'] ) + for( let n=0; nprinter
-
filament type
- - +
@@ -54,12 +40,6 @@
vendor
-
@@ -69,63 +49,6 @@
-
@@ -135,138 +58,6 @@
Create New
-