diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart index bed06ff..845f5c4 100644 --- a/lib/screens/home_screen.dart +++ b/lib/screens/home_screen.dart @@ -59,11 +59,11 @@ class _HomeScreenState extends State { mes = data.substring(4,6); ano = data.substring(0,4); } - alunos.add(AlunoModel(nome: list[i]['NO_ALUNO']??'', data_nasc: '${dia}/${mes}/${ano}', ra: list[i]['NR_RA']??'', escola: 'escola', serie: 'serie', turma: 'turma',dados: list[i])); + alunos.add(AlunoModel(nome: list[i]['NO_ALUNO']??'', data_nasc: '${dia}/${mes}/${ano}', ra: list[i]['NR_RA']??'', escola: '', serie: list[i]['DESC_SERIE'], turma: list[i]['TURMA'],dados: list[i])); resultadoPesquisa.add(alunos[i]); } }else{ - showSnackBar(context, 'Aluno(a) não localizado', Colors.red); + showSnackBar(context, 'Aluno(a) não matriculado em ${DateTime.now().year}', Colors.red); } setState(() { buscandoDados = false; @@ -155,7 +155,7 @@ class _HomeScreenState extends State { controller: inputPesquisa, width: width*0.25, inputFormatters: [], - fontSize: 12, + fontSize: 14, colorBackground: Colors.white, ), ButtonCustom( diff --git a/lib/screens/login_screen.dart b/lib/screens/login_screen.dart index c853ae5..662b0b0 100644 --- a/lib/screens/login_screen.dart +++ b/lib/screens/login_screen.dart @@ -21,8 +21,8 @@ class _LoginScreenState extends State { //AMENEZES LOGIN DIFERENTE DA SENHA //SENHAS CRIPTOGRAFADAS PORQUE FORMA ALTERADAS, SENHAS NOVAS USUÁRIO E SENHA SÃO IGUAIS // final inputLogin = TextEditingController(text: 'mmatos'); - final inputLogin = TextEditingController(text: 'admin'); - final inputSenha = TextEditingController(text: 'rkm12345'); + final inputLogin = TextEditingController(text: 'ibueno'); + final inputSenha = TextEditingController(text: 'ibueno'); // final inputSenha = TextEditingController(text: 'mmatos'); bool loading = false; diff --git a/lib/screens/responsible_register_screen.dart b/lib/screens/responsible_register_screen.dart index 5e4e4c9..be3c9ff 100644 --- a/lib/screens/responsible_register_screen.dart +++ b/lib/screens/responsible_register_screen.dart @@ -208,9 +208,9 @@ class _ResponsibleRegisterScreenState extends State { carregando = true; }); final url = 'http://localhost:8000/deleta?CPF=$cpf'; - print(url); + // print(url); final response = await http.get(Uri.parse(url)); - print(response.body); + // print(response.body); if(response.body == 'deletado com sucesso'){ responsaveis.removeAt(index); carregando = false; diff --git a/lib/widgets/dados_alunos_container.dart b/lib/widgets/dados_alunos_container.dart index ac8abb9..e854627 100644 --- a/lib/widgets/dados_alunos_container.dart +++ b/lib/widgets/dados_alunos_container.dart @@ -47,7 +47,7 @@ class DadosAlunosContainer extends StatelessWidget { ), Container( width: width*0.05, - child: TextCustom(text: alunoModel.serie.toUpperCase()+'°') + child: TextCustom(text: alunoModel.serie.toUpperCase()) ), Container( width: width*0.05, diff --git a/lib/widgets/dados_responsaveis_container.dart b/lib/widgets/dados_responsaveis_container.dart index 9214ff1..bb68eeb 100644 --- a/lib/widgets/dados_responsaveis_container.dart +++ b/lib/widgets/dados_responsaveis_container.dart @@ -35,9 +35,15 @@ class DadosResponsaveisContainer extends StatelessWidget { width: width*0.35, padding: EdgeInsets.symmetric(vertical: 10,horizontal: 5), child: Row( + crossAxisAlignment: CrossAxisAlignment.center, children: [ CaixaTextoContainer(texto: responsavelModel.NOME,titulo: 'Nome',widthCustom: 0.15), CaixaTextoContainer(texto: responsavelModel.PARENTESCO,titulo: 'Parentesco',widthCustom: 0.1,), + responsavelModel.CPF!='' && responsavelModel.SENHA!=''?Container( + alignment: Alignment.bottomCenter, + margin: EdgeInsets.all(5), + child: Icon(Icons.check_circle,color: Colors.green,), + ):Container() ], ), ),