reginaldo.silva/controle_acesso_educa
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adiciono icone, adicionado nome da tela de usuários, ajustado layout dos dados dos responsáveis

Browse Source
This commit is contained in:
Reginaldo
2023-08-14 15:34:51 -03:00
parent 4500ee04aa
commit 08ebbb0c45
13 changed files with 63 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/images/logo_icone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 161 KiB

2
lib/models/login_model.dart
View File

@@ -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,

15
lib/screens/home_screen.dart
View File

@@ -106,6 +106,7 @@ class _HomeScreenState extends State<HomeScreen> {
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<HomeScreen> {
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<HomeScreen> {
'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<HomeScreen> {
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<HomeScreen> {
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<HomeScreen> {
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<HomeScreen> {
),
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){

48
lib/screens/responsible_register_screen.dart
View File

@@ -271,24 +271,42 @@ class _ResponsibleRegisterScreenState extends State<ResponsibleRegisterScreen> {
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(

8
lib/widgets/item_acesso.dart
View File

@@ -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)

BIN
web/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
web/favicon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 917 B

BIN
web/icons/Icon-192.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.2 KiB

BIN
web/icons/Icon-512.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.1 KiB

BIN
web/icons/Icon-maskable-192.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.5 KiB

BIN
web/icons/Icon-maskable-512.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB

7
web/index.html
View File

@@ -11,13 +11,14 @@
<!-- iOS meta tags & icons -->
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="educa_controle_acesso">
<meta name="apple-mobile-web-app-title" content="CONTROLE DE ACESSO">
<link rel="apple-touch-icon" href="icons/Icon-192.png">
<!-- Favicon -->
<link rel="icon" type="image/png" href="favicon.png"/>
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
<link rel="icon" href="favicon.ico" type="image/x-icon"/>
<title>educa_controle_acesso</title>
<title>CONTROLE DE ACESSO</title>
<link rel="manifest" href="manifest.json">
<script>

12
web/manifest.json
View File

@@ -1,6 +1,6 @@
{
"name": "educa_controle_acesso",
"short_name": "educa_controle_acesso",
"name": "CONTROLE DE ACESSO",
"short_name": "CONTROLE DE ACESSO",
"start_url": ".",
"display": "standalone",
"background_color": "#0175C2",
@@ -10,23 +10,23 @@
"prefer_related_applications": false,
"icons": [
{
"src": "icons/Icon-192.png",
"src": "icons/icon-192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "icons/Icon-512.png",
"src": "icons/icon-512.png",
"sizes": "512x512",
"type": "image/png"
},
{
"src": "icons/Icon-maskable-192.png",
"src": "icons/icon-maskable-192.png",
"sizes": "192x192",
"type": "image/png",
"purpose": "maskable"
},
{
"src": "icons/Icon-maskable-512.png",
"src": "icons/icon-maskable-512.png",
"sizes": "512x512",
"type": "image/png",
"purpose": "maskable"