diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/00d7bdf6-6add-4bc5-b64e-dd234e721d48.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/0ecb6862-ced5-4957-aa99-c5373807e172.vsidx similarity index 76% rename from AgroBase/.vs/AgroBase/FileContentIndex/00d7bdf6-6add-4bc5-b64e-dd234e721d48.vsidx rename to AgroBase/.vs/AgroBase/FileContentIndex/0ecb6862-ced5-4957-aa99-c5373807e172.vsidx index d86c9439f..50a534624 100644 Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/00d7bdf6-6add-4bc5-b64e-dd234e721d48.vsidx and b/AgroBase/.vs/AgroBase/FileContentIndex/0ecb6862-ced5-4957-aa99-c5373807e172.vsidx differ diff --git a/AgroBase/.vs/AgroBase/v17/.suo b/AgroBase/.vs/AgroBase/v17/.suo index 1b6e2a9fa..cb450a6a0 100644 Binary files a/AgroBase/.vs/AgroBase/v17/.suo and b/AgroBase/.vs/AgroBase/v17/.suo differ diff --git a/AgroBase/AgroBase/Models/Operacoes/OperacaoModel.cs b/AgroBase/AgroBase/Models/Operacoes/OperacaoModel.cs index 378c72b7c..46801d8a5 100644 --- a/AgroBase/AgroBase/Models/Operacoes/OperacaoModel.cs +++ b/AgroBase/AgroBase/Models/Operacoes/OperacaoModel.cs @@ -144,7 +144,14 @@ namespace AgroBase.Models List _modsComFalha = Variaveis.OperacaoEmAndamento.ModulosMandatorios.Where(x => x.Mandatorio && !x.Conectado).Select(x => x.Dispositivo).ToList(); - ModulosConectados = (!_modsComFalha.Any(), _modsComFalha); + bool nenhumModuloMandatorio = Variaveis.OperacaoEmAndamento.ModulosMandatorios.All(x => !x.Mandatorio); + bool algumModuloConectado = Variaveis.OperacaoEmAndamento.ModulosMandatorios.Any(x => x.Conectado); + + bool _opLiberada = + (!nenhumModuloMandatorio && !_modsComFalha.Any()) || + (nenhumModuloMandatorio && algumModuloConectado); + + ModulosConectados = (_opLiberada, _modsComFalha); ErroOperacaoLiberada = GerarMensagemErroModulos(); }