diff --git a/resources/profiles/Eryone/filament/Eryone Silk PLA.json b/resources/profiles/Eryone/filament/Eryone Silk PLA.json index bb1adb80fe..18b2a30240 100644 --- a/resources/profiles/Eryone/filament/Eryone Silk PLA.json +++ b/resources/profiles/Eryone/filament/Eryone Silk PLA.json @@ -19,7 +19,7 @@ "12" ], "filament_type": [ - "Silk" + "PLA Silk" ], "filament_settings_id": [ "Eryone Silk PLA" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-Aero @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-Aero @base.json index 407c0960f2..c974d30795 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-Aero @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-Aero @base.json @@ -31,7 +31,7 @@ "1.5" ], "filament_type": [ - "ASA-Aero" + "ASA-AERO" ], "filament_vendor": [ "Bambu Lab" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI ASA-Aero @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI ASA-Aero @Q2.json index a4cf7ac5a8..297c007703 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI ASA-Aero @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI ASA-Aero @Q2.json @@ -49,7 +49,7 @@ "0" ], "filament_type": [ - "ASA-Aero" + "ASA-AERO" ], "filament_wipe": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi ASA-Aero.json b/resources/profiles/Qidi/filament/Qidi ASA-Aero.json index 5664259c48..283290da1c 100644 --- a/resources/profiles/Qidi/filament/Qidi ASA-Aero.json +++ b/resources/profiles/Qidi/filament/Qidi ASA-Aero.json @@ -7,7 +7,7 @@ "filament_id": "GFB99", "instantiation": "true", "filament_type": [ - "ASA-Aero" + "ASA-AERO" ], "filament_max_volumetric_speed": [ "16" diff --git a/resources/web/guide/22/22.css b/resources/web/guide/22/22.css index 81fd43b614..20e606e777 100644 --- a/resources/web/guide/22/22.css +++ b/resources/web/guide/22/22.css @@ -179,6 +179,11 @@ margin: 3px; } +.list-item-count { + color:var(--fg-color-label); + margin-left:10px +} + .cbr-filter-btns { display: flex; margin: 5px 5px 5px auto; diff --git a/resources/web/guide/22/22.js b/resources/web/guide/22/22.js index 3887aa32bc..b6bf64ee11 100644 --- a/resources/web/guide/22/22.js +++ b/resources/web/guide/22/22.js @@ -66,22 +66,35 @@ function SortUI() $('#MachineList .CValues').append(HtmlMode); $('#MachineList .CValues input').prop("checked",true); - if(nMode<=1) - { - $('#MachineList').hide(); - } + //if(nMode<=1) + //{ + // $('#MachineList').hide(); + //} + + //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); - //Filament let HtmlFilament=''; let SelectNumber=0; var TypeHtmlArray={}; var VendorHtmlArray={}; - var GenericFilamentHtmlArray={}; - var NonGenericFilamentHtmlArray={}; - for( let key in m_ProfileItem['filament'] ) + for( let n=0; n'+fShortName+''; + let HtmlFila=''; - // Separate generic and non-generic filaments - if(fVendor.toLowerCase() === 'generic') { - GenericFilamentHtmlArray[fShortName] = HtmlFila; - } else { - NonGenericFilamentHtmlArray[fShortName] = HtmlFila; - } + $("#ItemBlockArea").append(HtmlFila); } else { @@ -185,14 +193,6 @@ 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; @@ -240,6 +240,8 @@ function SortUI() $("#AcceptBtn").hide(); $("#GotoNetPluginBtn").show(); } + + UpdateStats(); } @@ -405,9 +407,28 @@ function SortFilament() else $(OneNode).hide(); } - else + else{ $(OneNode).hide(); + //alert(fName) //debug non common filament type + } } + + UpdateStats(); +} + +function UpdateStats() +{ + let $i = $("#ItemBlockArea"); + let $allItems = $i.find(".MItem"); + let $visibleItems = $i.find(".MItem:visible"); + let $filteredItems = $visibleItems.filter(function() { return $(this).css('position') !== 'absolute'}); + let visibleCount = Math.min($filteredItems.length, $visibleItems.length); + + $(".list-item-count").text( + $i.find("input:checked").length + " / " + + $allItems.length + + ($allItems.length > visibleCount ? (" [" + visibleCount + "]") : "") // filtered items + ); } function ChooseDefaultFilament() @@ -471,6 +492,8 @@ function ChooseDefaultFilament() } ShowNotice(0); + + UpdateStats(); } function SelectAllFilament( nShow ) diff --git a/resources/web/guide/22/index.html b/resources/web/guide/22/index.html index 70af38510f..cda89a68a8 100644 --- a/resources/web/guide/22/index.html +++ b/resources/web/guide/22/index.html @@ -84,6 +84,7 @@ +
Select filtered Select visible @@ -208,6 +209,8 @@ } list.querySelector('.cbr-no-items').style.display = (hidden === items.length) ? "block" : "none"; + + UpdateStats(); }); addClearBtnEvents(filterBar); diff --git a/resources/web/guide/23/23.css b/resources/web/guide/23/23.css index a9b802b016..596ffe10dc 100644 --- a/resources/web/guide/23/23.css +++ b/resources/web/guide/23/23.css @@ -143,14 +143,12 @@ #CFilament_List { display:flex; - overflow-x:auto; + overflow-y:auto; flex-wrap:wrap; - flex-direction: column; justify-content:flex-start; align-items: flex-start; align-content:flex-start; line-height: 32px; - height: 100%; } @@ -158,12 +156,17 @@ { display: flex; align-items: center; - margin-right: 30px; + margin-right: 10%; + width: 44%; +} + +.CFilament_Item:nth-of-type(2n) { + margin-right: 2%; } .CFilament_Name { - width: 220px; + width: 100%; overflow: hidden; white-space: nowrap; /* ?????? */ text-overflow: ellipsis; /* ????????? */ @@ -270,6 +273,11 @@ body:has(#SystemFilamentBtn.TitleSelected) #Content { /* :has selector browser s margin: 3px; } +.list-item-count { + color:var(--fg-color-label); + margin-left:10px +} + .cbr-filter-btns { display: flex; margin: 5px 5px 5px auto; diff --git a/resources/web/guide/23/23.js b/resources/web/guide/23/23.js index 251cc797ed..8649f7cd41 100644 --- a/resources/web/guide/23/23.js +++ b/resources/web/guide/23/23.js @@ -74,10 +74,10 @@ function SortUI() $('#MachineList .CValues').append(HtmlMode); $('#MachineList .CValues input').prop("checked",true); - if(nMode<=1) - { - $('#MachineList').hide(); - } + //if(nMode<=1) + //{ + // $('#MachineList').hide(); + //} //Filament - Create sorted array with generic vendor first let FilamentArray=new Array(); @@ -171,7 +171,7 @@ function SortUI() if(pFila.length==0) { /* ORCA use label tag to allow checkbox to toggle when user ckicked to text */ - let HtmlFila=''; + let HtmlFila=''; $("#ItemBlockArea").append(HtmlFila); } @@ -238,6 +238,8 @@ function SortUI() //------ if(SelectNumber==0) ChooseDefaultFilament(); + + UpdateStats(); } @@ -403,9 +405,29 @@ function SortFilament() else $(OneNode).hide(); } - else + else{ $(OneNode).hide(); + //alert(fName) //debug non common filament type + } + } + + UpdateStats(); +} + +function UpdateStats() +{ + let $i = $("#ItemBlockArea"); + let $allItems = $i.find(".MItem"); + let $visibleItems = $i.find(".MItem:visible"); + let $filteredItems = $visibleItems.filter(function() { return $(this).css('position') !== 'absolute'}); + let visibleCount = Math.min($filteredItems.length, $visibleItems.length); + + $(".list-item-count").text( + $i.find("input:checked").length + " / " + + $allItems.length + + ($allItems.length > visibleCount ? (" [" + visibleCount + "]") : "") // filtered items + ); } function ChooseDefaultFilament() @@ -461,6 +483,8 @@ function SelectAllFilament( nShow ) else { $('#ItemBlockArea .MItem:visible input').prop("checked",nShow!=0); } + + UpdateStats(); } function ShowNotice( nShow ) diff --git a/resources/web/guide/23/index.html b/resources/web/guide/23/index.html index 682b7dccd6..3ef35acd95 100644 --- a/resources/web/guide/23/index.html +++ b/resources/web/guide/23/index.html @@ -87,6 +87,7 @@
+
Select filtered Select visible @@ -107,7 +108,7 @@
Create New
-
+
@@ -228,6 +229,8 @@ } list.querySelector('.cbr-no-items').style.display = (hidden === items.length) ? "block" : "none"; + + UpdateStats(); }); addClearBtnEvents(filterBar);