diff --git a/lib/screens/registers_citizen/register_citizen_screen.dart b/lib/screens/registers_citizen/register_citizen_screen.dart index 4660b17..a86123d 100644 --- a/lib/screens/registers_citizen/register_citizen_screen.dart +++ b/lib/screens/registers_citizen/register_citizen_screen.dart @@ -755,7 +755,7 @@ class _RegisterCitizenScreenState extends State { double width = MediaQuery.of(context).size.width; return WillPopScope( - onWillPop:showTab?null: () async => await OnBackButton().onBackButton(context, widget.username), + onWillPop:edit?null: () async => await OnBackButton().onBackButton(context, widget.username), child: Scaffold( appBar: AppBarDefault().appbar(context, 'RKM AB - Cadastro Cidadão',widget.username), body: Container( diff --git a/lib/screens/registers_citizen/register_home_screen.dart b/lib/screens/registers_citizen/register_home_screen.dart index 902d6f0..46d8097 100644 --- a/lib/screens/registers_citizen/register_home_screen.dart +++ b/lib/screens/registers_citizen/register_home_screen.dart @@ -467,7 +467,7 @@ class _RegisterHomeScreenState extends State { double width = MediaQuery.of(context).size.width; return WillPopScope( - onWillPop: ()async => await OnBackButton().onBackButton(context, widget.username), + onWillPop: !edit?null:()async => await OnBackButton().onBackButton(context, widget.username), child: Scaffold( appBar: AppBarDefault().appbar(context, 'RKM AB - Cadastro Domiciliar',widget.username), body: Container( diff --git a/lib/screens/registers_citizen/register_individual_screen.dart b/lib/screens/registers_citizen/register_individual_screen.dart index 7a940e5..4cc5184 100644 --- a/lib/screens/registers_citizen/register_individual_screen.dart +++ b/lib/screens/registers_citizen/register_individual_screen.dart @@ -654,7 +654,7 @@ class _RegisterIndividualScreenState extends State { double width = MediaQuery.of(context).size.width; return WillPopScope( - onWillPop: showTab?null:()async=> await OnBackButton().onBackButton(context, widget.username), + onWillPop: !edit?null:()async=> await OnBackButton().onBackButton(context, widget.username), child: Scaffold( appBar: AppBarDefault().appbar(context, 'RKM AB - Cadastro Individual',widget.username), body: Container( diff --git a/lib/screens/select_service/atendimento_domiciliar_tela.dart b/lib/screens/select_service/atendimento_domiciliar_tela.dart index 8e51bfd..cc0a2cc 100644 --- a/lib/screens/select_service/atendimento_domiciliar_tela.dart +++ b/lib/screens/select_service/atendimento_domiciliar_tela.dart @@ -668,7 +668,7 @@ class _AtendimentoDomiciliarTelaState extends State { TitleContainers(title: 'Condição Avaliada',width: width * 0.73), widget.dados!=null && serviceHomeModel.length !=ConstVariable().serviceHomeCheckConditionlist.length?Container():Container( width: width*0.7, - height: heigth*0.95, + height: 1160, child: ListView.builder( physics: const NeverScrollableScrollPhysics(), itemCount: ConstVariable().serviceHomeCheckConditionlist.length, @@ -772,7 +772,7 @@ class _AtendimentoDomiciliarTelaState extends State { padding: const EdgeInsets.symmetric(horizontal: 10.0), child: Container( width: width*0.7, - height: heigth*0.9, + height: 970, child: ListView.builder( physics: const NeverScrollableScrollPhysics(), itemCount: ConstVariable().serviceHomeCheckProclist.length, diff --git a/lib/screens/select_service/visita_domiciliar_tela.dart b/lib/screens/select_service/visita_domiciliar_tela.dart index b1dbcfa..089dc24 100644 --- a/lib/screens/select_service/visita_domiciliar_tela.dart +++ b/lib/screens/select_service/visita_domiciliar_tela.dart @@ -793,7 +793,7 @@ class _VisitaDomiciliarTelaState extends State { TitleContainers(title: 'Acompanhamento',width: width*0.7,textAling: TextAlign.start,fontSize: 15), Container( width: width*0.7, - height: heigth*0.9, + height: 1060, child: widget.dados!=null && tipoAcompanhamentoModel.isEmpty?Container():ListView.builder( physics: const NeverScrollableScrollPhysics(), itemCount: ConstVariable().tipoAcompanhamentoModel.length, @@ -818,7 +818,7 @@ class _VisitaDomiciliarTelaState extends State { TitleContainers(title: 'Outros',width: width*0.7,textAling: TextAlign.start,fontSize: 15), Container( width: width*0.7, - height: heigth*0.22, + height: 200, child: outrosModel.isEmpty && widget.dados!=null?Container():ListView.builder( physics: const NeverScrollableScrollPhysics(), itemCount: ConstVariable().outrosModel.length, diff --git a/pubspec.yaml b/pubspec.yaml index caa1962..c2265fe 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,9 +7,11 @@ description: RKM AB 2.0. #versão 1.0.11+12 AJUSTES PARA NÃO EXIBIR MICROAREA NULL, E AJUSTE DADOS FORA DE AREA DIA 23/08/2024 #versão 1.0.12+13 AJUSTE DE ID E DESCRIÇÃO DE AREA E MICROAREA, AJUSTE DA MENSAGEM DADOS SALVOS DA EDIÇÃO DO PACIENTE. 26/08/2024 #versão 1.0.13+14 SETSTATE SALVAR DADOS CIDADAO E EDITAR E EXCLUIR ATENDICMENTO E VISITA. 27/08/2024 +#versão 1.0.13+14 EDITAR E EXCLUIR VISITA DOMICILIAR E ALTERADA PARA ZERO SEM FORA DE AREA E UM PARA FORA DE AREA. 28/08/2024 +#versão 1.0.14+15 AJUSTADA A ALTURA DA LISTA DOS PROCEDIMENTOS E DO ACOMPANHAMENTO, E A MENSAGEM DE AVISO DE NÃO SALVAR QUANDO ESTIVER EM EDIÇÃO. 29/08/2024 publish_to: 'none' -version: 1.0.13+14 +version: 1.0.14+15 environment: sdk: '>=3.2.3 <4.0.0'