FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

xx

Browse Source
This commit is contained in:
Applevangelist 2024-08-18 19:33:24 +02:00
parent 4859ea2fb1
commit 43ffad02be
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Moose Development/Moose/Core/Set.lua
View File

@ -2003,12 +2003,13 @@ do
if self.Filter.Categories and MGroupInclude then if self.Filter.Categories and MGroupInclude then
local MGroupCategory = false local MGroupCategory = false
for CategoryID, CategoryName in pairs( self.Filter.Categories ) do for CategoryID, CategoryName in pairs( self.Filter.Categories ) do
--self:T3( { "Category:", MGroup:GetCategory(), self.FilterMeta.Categories[CategoryName], CategoryName } ) --self:I( { "Category:", MGroup:GetCategory(), self.FilterMeta.Categories[CategoryName], CategoryName } )
if self.FilterMeta.Categories[CategoryName] and self.FilterMeta.Categories[CategoryName] == MGroup:GetCategory() then if self.FilterMeta.Categories[CategoryName] and self.FilterMeta.Categories[CategoryName] == MGroup:GetCategory() then
MGroupCategory = true MGroupCategory = true
end end
end end
MGroupInclude = MGroupInclude and MGroupCategory MGroupInclude = MGroupInclude and MGroupCategory
--self:I("Is Included: "..tostring(MGroupInclude))
end end
if self.Filter.Countries and MGroupInclude then if self.Filter.Countries and MGroupInclude then
@ -2025,12 +2026,13 @@ do
if self.Filter.GroupPrefixes and MGroupInclude then if self.Filter.GroupPrefixes and MGroupInclude then
local MGroupPrefix = false local MGroupPrefix = false
for GroupPrefixId, GroupPrefix in pairs( self.Filter.GroupPrefixes ) do for GroupPrefixId, GroupPrefix in pairs( self.Filter.GroupPrefixes ) do
--self:T3( { "Prefix:", string.find( MGroup:GetName(), GroupPrefix, 1 ), GroupPrefix } ) --self:I( { "Prefix:", MGroup:GetName(), GroupPrefix } )
if string.find( MGroup:GetName(), GroupPrefix:gsub( "-", "%%-" ), 1 ) then if string.find( string.lower(MGroup:GetName()), string.lower(GroupPrefix), 1 ) or string.find( string.lower(MGroup:GetName()), string.lower(GroupPrefix), 1, true ) then
MGroupPrefix = true MGroupPrefix = true
end end
end end
MGroupInclude = MGroupInclude and MGroupPrefix MGroupInclude = MGroupInclude and MGroupPrefix
--self:I("Is Included: "..tostring(MGroupInclude))
end end
if self.Filter.Zones and MGroupInclude then if self.Filter.Zones and MGroupInclude then
@ -2050,7 +2052,7 @@ do
MGroupInclude = MGroupInclude and MGroupFunc MGroupInclude = MGroupInclude and MGroupFunc
end end
--self:T2( MGroupInclude ) --self:I( MGroupInclude )
return MGroupInclude return MGroupInclude
end end

2
Moose Development/Moose/Wrapper/Group.lua
View File

@ -516,7 +516,7 @@ function GROUP:GetCategory()
local DCSGroup = self:GetDCSObject() local DCSGroup = self:GetDCSObject()
if DCSGroup then if DCSGroup then
local GroupCategory = DCSGroup:getCategory() local GroupCategory = DCSGroup:getCategory()
self:T3( GroupCategory ) --self:I( GroupCategory )
return GroupCategory return GroupCategory
end end