From 1ffaa70fed7960f1d82960715f04b961eae6b677 Mon Sep 17 00:00:00 2001 From: Reginaldo Date: Fri, 11 Aug 2023 08:40:02 -0300 Subject: [PATCH] =?UTF-8?q?ajustes=20para=20usu=C3=A1rios=20bloqueados?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/screens/login_screen.dart | 8 ++++---- lib/screens/responsible_register_screen.dart | 12 +++++++----- lib/widgets/dados_responsaveis_container.dart | 16 ++++++++-------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/lib/screens/login_screen.dart b/lib/screens/login_screen.dart index 86e73ef..cebd250 100644 --- a/lib/screens/login_screen.dart +++ b/lib/screens/login_screen.dart @@ -23,11 +23,11 @@ class _LoginScreenState extends State { //las1594@@ //SENHAS CRIPTOGRAFADAS PORQUE FORMA ALTERADAS, SENHAS NOVAS USUÁRIO E SENHA SÃO IGUAIS //ibueno - // final inputLogin = TextEditingController(text: 'admin'); - // final inputSenha = TextEditingController(text: 'las1594@@'); + final inputLogin = TextEditingController(text: 'admin'); + final inputSenha = TextEditingController(text: 'las1594@@'); // final inputCodigo = TextEditingController(text: 'e003'); - final inputLogin = TextEditingController(); - final inputSenha = TextEditingController(); + // final inputLogin = TextEditingController(); + // final inputSenha = TextEditingController(); final inputCodigo = TextEditingController(); bool carregando = false; List listCodigo = []; diff --git a/lib/screens/responsible_register_screen.dart b/lib/screens/responsible_register_screen.dart index 705aaeb..97ae6cc 100644 --- a/lib/screens/responsible_register_screen.dart +++ b/lib/screens/responsible_register_screen.dart @@ -38,7 +38,7 @@ class _ResponsibleRegisterScreenState extends State { var inputData = TextEditingController(); bool carregando = true; - bloquearResponsavel(int index)async{ + bloquearResponsavel(int index,String CONDICAO)async{ final url = '${widget.alunoModel.URL}/inserirpais'; final response = await http.post( @@ -51,7 +51,7 @@ class _ResponsibleRegisterScreenState extends State { 'SENHA' : responsaveis[index].SENHA, 'PARENTESCO' : responsaveis[index].PARENTESCO, 'DATA_CADASTRO' : DateFormat('dd/MM/yyyy HH:mm').format(DateTime.now()), - 'CONDICAO' : 'BLOQUEADO', + 'CONDICAO' : CONDICAO=='BLOQUEADO'?'EDITADO':'BLOQUEADO', 'CIDADE' : widget.alunoModel.cidade } ); @@ -510,8 +510,10 @@ class _ResponsibleRegisterScreenState extends State { context: context, builder: (BuildContext context){ return AlertDialog( - title: TextCustom(text: 'Bloquear'), - content: TextCustom(text:'Deseja realmente bloquear esse responsável?',), + title: TextCustom(text: responsaveis[index].CONDICAO=='BLOQUEADO'?'Desbloquear':'Bloquear'), + content: TextCustom(text:responsaveis[index].CONDICAO=='BLOQUEADO' + ?'Deseja realmente desbloquear esse responsável' + :'Deseja realmente bloquear esse responsável?',), actions: [ ButtonCustom( onPressed:()=>Navigator.pop(context), @@ -528,7 +530,7 @@ class _ResponsibleRegisterScreenState extends State { editando = true; carregando = true; setState(() {}); - bloquearResponsavel(index); + bloquearResponsavel(index,responsaveis[index].CONDICAO); }, text: 'SIM', widthCustom: 0.1, diff --git a/lib/widgets/dados_responsaveis_container.dart b/lib/widgets/dados_responsaveis_container.dart index ed8317e..debe6ed 100644 --- a/lib/widgets/dados_responsaveis_container.dart +++ b/lib/widgets/dados_responsaveis_container.dart @@ -16,11 +16,11 @@ class DadosResponsaveisContainer extends StatelessWidget { var bloquearSenha; DadosResponsaveisContainer({ - required this.responsavelModel, - required this.onTapEdit, - required this.onTapDelete, - required this.resetarSenha, - required this.bloquearSenha + required this.responsavelModel, + required this.onTapEdit, + required this.onTapDelete, + required this.resetarSenha, + required this.bloquearSenha, }); @override @@ -52,8 +52,8 @@ class DadosResponsaveisContainer extends StatelessWidget { ):Container(height: 12,width: 30,), Column( children: [ - SizedBox(height: 12,), - ButtonCustom( + responsavelModel.CONDICAO=='BLOQUEADO'?Container():SizedBox(height: 12,), + responsavelModel.CONDICAO=='BLOQUEADO'||responsavelModel.CONDICAO==''?Container(): ButtonCustom( text: 'Resetar Senha', fontSize: 14.0, colorButton: PaletteColors.grey, @@ -70,7 +70,7 @@ class DadosResponsaveisContainer extends StatelessWidget { children: [ SizedBox(height: 12,), ButtonCustom( - text: 'Bloquear Responsável', + text: responsavelModel.CONDICAO=='BLOQUEADO'?'Desbloquear Responsável':'Bloquear Responsável', fontSize: 14.0, colorButton: PaletteColors.primaryColor, colorText: PaletteColors.white,