diff --git a/assets/images/logo_icone.png b/assets/images/logo_icone.png new file mode 100644 index 0000000..ef13495 Binary files /dev/null and b/assets/images/logo_icone.png differ diff --git a/lib/models/login_model.dart b/lib/models/login_model.dart index 88c8e7f..474f274 100644 --- a/lib/models/login_model.dart +++ b/lib/models/login_model.dart @@ -1,6 +1,7 @@ class LoginModel{ bool CHECK; String ID_USUARIO; + String NO_USUARIO_SISTEMA; String DATA; String CADASTRADO_POR; String CIDADE; @@ -9,6 +10,7 @@ class LoginModel{ LoginModel({ required this.CHECK, required this.ID_USUARIO, + required this.NO_USUARIO_SISTEMA, required this.DATA, required this.CADASTRADO_POR, required this.CIDADE, diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart index be42995..47a635e 100644 --- a/lib/screens/home_screen.dart +++ b/lib/screens/home_screen.dart @@ -106,6 +106,7 @@ class _HomeScreenState extends State { logins.add( LoginModel( ID_USUARIO: list[i]['ID_USUARIO'], + NO_USUARIO_SISTEMA:list[i]['NO_USUARIO_SISTEMA']??'', CHECK:list[i]['CONDICAO']=='1'?true: false, STATUS: 'CADASTRADO', CADASTRADO_POR:list[i]['CADASTRADO_POR'], @@ -136,7 +137,7 @@ class _HomeScreenState extends State { if(list.length!=0){ for(int i=0;list.length>i;i++){ if(list[i]['NO_USERNAME']!='ADMIN'){ - logins.add(LoginModel(ID_USUARIO: list[i]['NO_USERNAME'],CHECK: false,STATUS: 'NOVO',CIDADE: widget.dados[0],CADASTRADO_POR: 'NÃO CADASTRADO',DATA: '00/00/0000')); + logins.add(LoginModel(ID_USUARIO: list[i]['NO_USERNAME'],NO_USUARIO_SISTEMA:list[i]['NO_USUARIO_SISTEMA']??'',CHECK: false,STATUS: 'NOVO',CIDADE: widget.dados[0],CADASTRADO_POR: 'NÃO CADASTRADO',DATA: '00/00/0000')); } } }else{ @@ -156,6 +157,7 @@ class _HomeScreenState extends State { 'CONDICAO': logins[index].CHECK?"1":"2", 'CADASTRADO_POR': widget.dados[1].toString().toUpperCase(), 'ID_USUARIO' : logins[index].ID_USUARIO, + 'NO_USUARIO_SISTEMA': logins[index].NO_USUARIO_SISTEMA, 'CIDADE': widget.dados[0], 'NOVO' : logins[index].STATUS == 'NOVO'? 'SIM':'NAO' } @@ -294,9 +296,13 @@ class _HomeScreenState extends State { children: [ SizedBox(width: 30,), Container( - width: width*0.15, + width: width*0.12, child: TextCustom(text: 'USUÁRIO',size: 12,fontWeight: FontWeight.bold,color: Colors.black87,), ), + Container( + width: width*0.2, + child: TextCustom(text: 'NOME',size: 12,fontWeight: FontWeight.bold,color: Colors.black87,), + ), Container( width: width*0.1, child: TextCustom(text: 'DATA DO CADASTRO',size: 12,fontWeight: FontWeight.bold,color: Colors.black87,), @@ -317,7 +323,7 @@ class _HomeScreenState extends State { border: Border.all(color: logins.length==0?Colors.white:PaletteColors.grey) ), margin: EdgeInsets.symmetric(horizontal: width>900?width*0.1:width*0.05), - height: height*0.77, + height: height*0.74, child: ListView.builder( itemCount: logins.length, itemBuilder: (context,index){ @@ -325,6 +331,7 @@ class _HomeScreenState extends State { index: index, check: logins[index].CHECK, ID_USUARIO: logins[index].ID_USUARIO, + NO_USUARIO_SISTEMA: logins[index].NO_USUARIO_SISTEMA, CADASTRADO_POR: logins[index].CADASTRADO_POR, CIDADE: logins[index].CIDADE, DATA: logins[index].DATA, @@ -541,7 +548,7 @@ class _HomeScreenState extends State { ), margin: EdgeInsets.symmetric(horizontal: width>900?width*0.1:width*0.05), width: width*0.75, - height: height*0.77, + height: height*0.74, child: ListView.builder( itemCount: resultadoPesquisa.length, itemBuilder:(context,index){ diff --git a/lib/screens/responsible_register_screen.dart b/lib/screens/responsible_register_screen.dart index 97ae6cc..7059b96 100644 --- a/lib/screens/responsible_register_screen.dart +++ b/lib/screens/responsible_register_screen.dart @@ -271,24 +271,42 @@ class _ResponsibleRegisterScreenState extends State { TextCustom(text: 'AGUARDE ...') ], ), - ):Padding( + ):Container( + alignment: Alignment.topLeft, padding: const EdgeInsets.all(30.0), child: Column( children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - CaixaTextoContainer(texto: widget.alunoModel.nome.toUpperCase(),titulo: 'Estudante'), - CaixaTextoContainer(texto: widget.alunoModel.serie.toUpperCase()+'°',titulo: 'Série',), - CaixaTextoContainer(texto: widget.alunoModel.turma.toUpperCase(),titulo: 'Turma',), - ], - ), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - CaixaTextoContainer(texto: widget.alunoModel.ra.toUpperCase(),titulo: 'RA'), - CaixaTextoContainer(texto: widget.alunoModel.escola.toUpperCase(),titulo: 'Escola',), - ], + Container( + width: width, + alignment: Alignment.centerLeft, + child: Container( + alignment: Alignment.centerLeft, + width: width*0.7, + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + border: Border.all(color: PaletteColors.grey,width: 2) + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + CaixaTextoContainer(texto: widget.alunoModel.nome.toUpperCase(),titulo: 'Estudante'), + CaixaTextoContainer(texto: widget.alunoModel.serie.toUpperCase()+'°',titulo: 'Série',), + CaixaTextoContainer(texto: widget.alunoModel.turma.toUpperCase(),titulo: 'Turma',), + ], + ), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + CaixaTextoContainer(texto: widget.alunoModel.ra.toUpperCase(),titulo: 'RA'), + CaixaTextoContainer(texto: widget.alunoModel.escola.toUpperCase(),titulo: 'Escola',), + ], + ), + ], + ), + ), ), SizedBox(height: 50,), Row( diff --git a/lib/widgets/item_acesso.dart b/lib/widgets/item_acesso.dart index fe2716f..df7bfd3 100644 --- a/lib/widgets/item_acesso.dart +++ b/lib/widgets/item_acesso.dart @@ -7,6 +7,7 @@ import '../utils/colors.dart'; class ItemAcesso extends StatelessWidget { bool check; String ID_USUARIO; + String NO_USUARIO_SISTEMA; String DATA; String CADASTRADO_POR; String CIDADE; @@ -16,6 +17,7 @@ class ItemAcesso extends StatelessWidget { ItemAcesso({ required this.check, required this.ID_USUARIO, + required this.NO_USUARIO_SISTEMA, required this.DATA, required this.CADASTRADO_POR, required this.CIDADE, @@ -43,9 +45,13 @@ class ItemAcesso extends StatelessWidget { onChanged:onChanged ), Container( - width: width*0.15, + width: width*0.12, child: TextCustom(text: ID_USUARIO) ), + Container( + width: width*0.2, + child: TextCustom(text: NO_USUARIO_SISTEMA) + ), Container( width: width*0.1, child: TextCustom(text: formataData) diff --git a/web/favicon.ico b/web/favicon.ico new file mode 100644 index 0000000..23a77f9 Binary files /dev/null and b/web/favicon.ico differ diff --git a/web/favicon.png b/web/favicon.png deleted file mode 100644 index 8aaa46a..0000000 Binary files a/web/favicon.png and /dev/null differ diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png deleted file mode 100644 index b749bfe..0000000 Binary files a/web/icons/Icon-192.png and /dev/null differ diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png deleted file mode 100644 index 88cfd48..0000000 Binary files a/web/icons/Icon-512.png and /dev/null differ diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png deleted file mode 100644 index eb9b4d7..0000000 Binary files a/web/icons/Icon-maskable-192.png and /dev/null differ diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png deleted file mode 100644 index d69c566..0000000 Binary files a/web/icons/Icon-maskable-512.png and /dev/null differ diff --git a/web/index.html b/web/index.html index 99a968a..1b904be 100644 --- a/web/index.html +++ b/web/index.html @@ -11,13 +11,14 @@ - + - + + - educa_controle_acesso + CONTROLE DE ACESSO