feat(ui): Flows-oprydning — tavle grupperet Ind/Ud efter navn, traktorer: egne+ledige (Vis alle), bygninger: valgte først, uden markør skjult (Vis alle); fix: staldes foderkrybbe (feedingTrough) i stationsopslag og bygningsmarkører — hønsehus (v1.19.0.0)

2026-09-24 19:31:57 +02:00
parent b3d49c4857
commit 99c509ea10
13 changed files with 334 additions and 26 deletions
@@ -70,10 +70,14 @@ function SmartPickupFrame:fillBoardRows(adEnv)
    local rows = {}
    local header = self:addTextRow(self.i18n:getText("spu_section_flows"))
    table.insert(rows, header.parent)
-    for _, run in ipairs(ADRunsController.store.runs) do
-        local title = self:addTextRow(self:describeFlow(adEnv, run, run.id == self.selectedRunId))
-        table.insert(rows, title.parent)
-        table.insert(self.boardRows, {run = run, title = title})
+    -- grupperet: Ind til bygning, så Ud fra bygning — hver efter navn
+    for _, group in ipairs(ADFlowView.boardGroups(ADRunsController.store.runs)) do
+        table.insert(rows, self:addTextRow(self.i18n:getText(group.kind == "outbound" and "spu_board_outbound" or "spu_board_supply")).parent)
+        for _, run in ipairs(group.runs) do
+            local title = self:addTextRow(self:describeFlow(adEnv, run, run.id == self.selectedRunId))
+            table.insert(rows, title.parent)
+            table.insert(self.boardRows, {run = run, title = title})
+        end
    end
    if #ADRunsController.store.runs == 0 then
        table.insert(rows, self:addTextRow(self.i18n:getText("spu_noRuns")).parent)
@@ -126,17 +130,29 @@ function SmartPickupFrame:fillBuildingRows(adEnv, run, role)
    local rowKind = role == "load" and "sourceBuilding" or role == "store" and "storeBuilding" or "targetBuilding"
    for _, id in ipairs(ids or {}) do chosen[id] = true end
    local count = 0
+    -- kandidater -> valgte først, så med markør; uden markør kun med "Vis alle bygninger"
+    local candidates = {}
    for _, building in ipairs(ADBuildings.list(adEnv, g_currentMission:getFarmId())) do
        -- "Lager til": siloer og gårdens fabrikker (fx BGA) — markøren er bygningens aflæsningsmarkør
        local fits = (role == "load" and building.canBeSource) or (role == "unload" and building.canBeTarget)
            or (role == "store" and (building.kind == "silo" or building.kind == "factory"))
        if fits then
-            count = count + 1
-            local row = self:addRow(self.ingredientPrefab, {kind = rowKind, buildingId = building.id})
-            row:getDescendantByName("title"):setText(self:describeBuilding(building, role == "store" and "unload" or role))
-            row:getDescendantByName("option"):setState(chosen[building.id] and SmartPickupFrame.STATE_ON or SmartPickupFrame.STATE_OFF, false)
+            local markers = ADBuildings.getMarkers ~= nil and ADBuildings.getMarkers(building, role == "store" and "unload" or role) or {}
+            table.insert(candidates, {id = building.id, name = building.name, hasMarker = markers[1] ~= nil, building = building})
        end
    end
+    local shown = ADFlowView.buildingRows(candidates, chosen, self.showAllBuildings == true)
+    local hiddenBuildings = ADFlowView.hiddenCount(candidates, shown)
+    if hiddenBuildings > 0 or self.showAllBuildings then
+        self:addToggleRow("showAllBuildings", string.format(self.i18n:getText("spu_showAllBuildings"), hiddenBuildings), {self.i18n:getText("ui_no"), self.i18n:getText("ui_yes")}, self.showAllBuildings == true)
+    end
+    for _, entry in ipairs(shown) do
+        local building = entry.building
+        count = count + 1
+        local row = self:addRow(self.ingredientPrefab, {kind = rowKind, buildingId = building.id})
+        row:getDescendantByName("title"):setText(self:describeBuilding(building, role == "store" and "unload" or role))
+        row:getDescendantByName("option"):setState(chosen[building.id] and SmartPickupFrame.STATE_ON or SmartPickupFrame.STATE_OFF, false)
+    end
    -- valgte bygninger der ikke længere findes (solgt)
    for _, id in ipairs(ids or {}) do
        if ADBuildings.find(adEnv, g_currentMission:getFarmId(), id) == nil then
@@ -267,7 +267,11 @@ function SmartPickupFrame:setStaticRowsVisible(tab, run)
    end
 end

+-- Samme rækkefølge som tavlen: Ind til bygning først, så Ud fra bygning, hver efter navn.
 function SmartPickupFrame:getRunsForTab()
+    if ADFlowView ~= nil then
+        return ADFlowView.orderedRuns(ADRunsController.store.runs)
+    end
    return ADRunsController.store.runs
 end

@@ -433,28 +437,46 @@ function SmartPickupFrame:fillWaitPoolOption(adEnv, run)
    self.waitPoolOption:setState(index, false)
 end

+-- Traktorer: som standard flowets egne og de ledige der kan bruges; "Vis alle" tilføjer traktorer i andre
+-- flows og låste (vognen passer ikke) — de er tit mange og gør listen uoverskuelig.
 function SmartPickupFrame:fillVehicleRows(adEnv, run)
    local inRun = {}
    for _, id in ipairs(run.vehicleIds) do
        inRun[id] = true
    end
+    local entries = {}
    for _, vehicle in ipairs(ADRunsController.getFarmVehicles(adEnv)) do
        local id = ADRunsController.getVehicleId(vehicle)
+        local otherRun = ADRunsController.getRunForVehicle(vehicle)
+        local state = "free"
+        if inRun[id] then
+            state = "in"
+        elseif otherRun ~= nil and otherRun.id ~= run.id then
+            state = "other"
+        elseif SmartPickupFrame.VEHICLE_BLOCKING_REASONS[ADRunsController.validateVehicle(adEnv, run, vehicle).reason] then
+            state = "blocked"
+        end
+        table.insert(entries, {id = id, label = ADRunsController.getVehicleLabel(adEnv, vehicle), state = state, vehicle = vehicle, otherRun = otherRun})
+    end
+    local rows = ADFlowView.vehicleRows(entries, self.showAllVehicles == true)
+    local hidden = ADFlowView.hiddenCount(entries, rows)
+    if hidden > 0 or self.showAllVehicles then
+        self.showAllVehiclesOption = self:addToggleRow("showAllVehicles", string.format(self.i18n:getText("spu_showAllVehicles"), hidden), {self.i18n:getText("ui_no"), self.i18n:getText("ui_yes")}, self.showAllVehicles == true)
+    end
+    for _, entry in ipairs(rows) do
+        local vehicle = entry.vehicle
        local row = self:addRow(self.vehiclePrefab, {kind = "vehicle", vehicle = vehicle, row = nil})
        local option, title = row:getDescendantByName("option"), row:getDescendantByName("title")
        self.rowData[option].row = row
-        option:setState(inRun[id] and SmartPickupFrame.STATE_ON or SmartPickupFrame.STATE_OFF, false)
-        -- Traktorer i et ANDET run kan ikke vælges her (én traktor = ét run); rækken viser hvor den er.
-        local otherRun = ADRunsController.getRunForVehicle(vehicle)
-        if otherRun ~= nil and otherRun.id ~= run.id then
+        option:setState(entry.state == "in" and SmartPickupFrame.STATE_ON or SmartPickupFrame.STATE_OFF, false)
+        if entry.state == "other" then
+            -- én traktor = ét flow; rækken viser hvor den er
            option:setDisabled(true)
            self.rowData[option].locked = true
-            title:setText(string.format("%s — %s", ADRunsController.getVehicleLabel(adEnv, vehicle), string.format(self.i18n:getText("spu_inRun"), tostring(otherRun.name))))
+            title:setText(string.format("%s — %s", entry.label, string.format(self.i18n:getText("spu_inRun"), tostring(entry.otherRun.name))))
        else
-            title:setText(self:describeVehicle(adEnv, run, vehicle, inRun[id]))
-            -- Vogn der ikke kan bære run'ets varer (ingen vogn / forkert vogn / paller uden UAL) kan ikke
-            -- vælges; er den allerede i run'et, kan den stadig fravælges.
-            if not inRun[id] and SmartPickupFrame.VEHICLE_BLOCKING_REASONS[ADRunsController.validateVehicle(adEnv, run, vehicle).reason] then
+            title:setText(self:describeVehicle(adEnv, run, vehicle, entry.state == "in"))
+            if entry.state == "blocked" then
                option:setDisabled(true)
                self.rowData[option].locked = true
            end
@@ -678,6 +700,11 @@ function SmartPickupFrame:onClickIngredient(state, element)
        return self:onClickCollectRound(state)
    elseif data ~= nil and data.kind == "direction" then
        return self:onClickDirection(state)
+    elseif data ~= nil and (data.kind == "showAllVehicles" or data.kind == "showAllBuildings") then
+        local isOn = state == SmartPickupFrame.STATE_ON
+        if data.kind == "showAllVehicles" then self.showAllVehicles = isOn else self.showAllBuildings = isOn end
+        self:requestRebuild()
+        return
    elseif data ~= nil and (data.kind == "sourceBuilding" or data.kind == "targetBuilding" or data.kind == "storeBuilding") then
        return self:onClickBuilding(state, element)
    end