From 80ea18c48610909ed77bfed2699982085c4ec7db Mon Sep 17 00:00:00 2001 From: Reginaldo Date: Tue, 6 Feb 2024 15:53:23 -0300 Subject: [PATCH] ajustes para exibir e salvos dados no cadastro individual e visita domiciliar --- lib/screens/attendance_list_screen.dart | 78 ++++++++++++------- .../register_citizen_screen.dart | 6 +- .../register_home_screen.dart | 62 ++++++++------- .../register_individual_screen.dart | 5 +- .../select_service/home_visit_screen.dart | 8 +- .../select_service/service_home_screen.dart | 6 +- lib/service/api/api_data_load.dart | 2 +- lib/service/db/db_sqlite_sync.dart | 16 ++-- lib/widgets/input_text.dart | 2 +- lib/widgets/input_with_subtitle.dart | 17 ++-- 10 files changed, 118 insertions(+), 84 deletions(-) diff --git a/lib/screens/attendance_list_screen.dart b/lib/screens/attendance_list_screen.dart index 44be6e6..277e474 100644 --- a/lib/screens/attendance_list_screen.dart +++ b/lib/screens/attendance_list_screen.dart @@ -2,6 +2,8 @@ import 'package:flutter/material.dart'; import 'package:rkm/config/color_palette.dart'; import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/text_default.dart'; +import 'package:sqflite/sqflite.dart'; +import '../service/db/db_sqlite_load.dart'; import '../widgets/appbar_default.dart'; class AttendanceListScreen extends StatefulWidget { @@ -14,6 +16,30 @@ class AttendanceListScreen extends StatefulWidget { } class _AttendanceListScreenState extends State { + + List visitHome = []; + List citizenUpdate = []; + List serviceHome = []; + + getData()async{ + Database db = await DbSqliteLoad().intialDB(); + visitHome = await db.query('VISITAS_DOMICILIARES_PROC'); + citizenUpdate = await db.query('CIDADAOS WHERE SINCRONIZADO = "N"'); + serviceHome =await db.query('ATENDS_DOM_PROC'); + print(await db.query('ATENDS_DOM_PROC')); + // print(await db.query('VISITAS_DOMICILIARES_PROC')); + // print(await db.query('CIDADAOS WHERE SINCRONIZADO = "N"')); + print(citizenUpdate.length); + // List list = await db.rawQuery('SELECT * FROM CIDADAOS WHERE CNS = $CNS'); + setState(() {}); + } + + @override + void initState() { + super.initState(); + getData(); + } + @override Widget build(BuildContext context) { return Scaffold( @@ -30,41 +56,41 @@ class _AttendanceListScreenState extends State { child: Column( children: [ TextDefault( - text: 'Atendimentos Domiciliares: 0 | Atendimento Individuais: 0', + text: 'Atendimentos Domiciliares: ${serviceHome.length} | Visitas Domiciliares: ${visitHome.length}', fontWeigth: FontWeight.bold, color: ColorPalette.black54, fontSize: 18, ), + // TextDefault( + // text: 'Atendimentos Odontológicos: 0 | Avaliação Elegibilidade: 0', + // fontWeigth: FontWeight.bold, + // color: ColorPalette.black54, + // fontSize: 18, + // ), TextDefault( - text: 'Atendimentos Odontológicos: 0 | Avaliação Elegibilidade: 0', - fontWeigth: FontWeight.bold, - color: ColorPalette.black54, - fontSize: 18, - ), - TextDefault( - text: 'Cadastros Cidadãos Realizados / Atualizados : 0', - fontWeigth: FontWeight.bold, - color: ColorPalette.black54, - fontSize: 18, - ), - TextDefault( - text: 'Fichas Complementares: 0 | Marcadores de Consumo : 0', - fontWeigth: FontWeight.bold, - color: ColorPalette.black54, - fontSize: 18, - ), - TextDefault( - text: 'Procedimentos Consolidados: 0 | Procedimentos Individuais : 0', - fontWeigth: FontWeight.bold, - color: ColorPalette.black54, - fontSize: 18, - ), - TextDefault( - text: 'Visitas Domiciliares: 0', + text: 'Cadastros Cidadãos Realizados / Atualizados : ${citizenUpdate.length}', fontWeigth: FontWeight.bold, color: ColorPalette.black54, fontSize: 18, ), + // TextDefault( + // text: 'Fichas Complementares: 0 | Marcadores de Consumo : 0', + // fontWeigth: FontWeight.bold, + // color: ColorPalette.black54, + // fontSize: 18, + // ), + // TextDefault( + // text: 'Procedimentos Consolidados: 0 | Procedimentos Individuais : 0', + // fontWeigth: FontWeight.bold, + // color: ColorPalette.black54, + // fontSize: 18, + // ), + // TextDefault( + // text: 'Visitas Domiciliares: ${visitHome.length}', + // fontWeigth: FontWeight.bold, + // color: ColorPalette.black54, + // fontSize: 18, + // ), ], ) ), diff --git a/lib/screens/registers_citizen/register_citizen_screen.dart b/lib/screens/registers_citizen/register_citizen_screen.dart index 4276106..0e987cd 100644 --- a/lib/screens/registers_citizen/register_citizen_screen.dart +++ b/lib/screens/registers_citizen/register_citizen_screen.dart @@ -153,12 +153,11 @@ class _RegisterCitizenScreenState extends State { locale: Locale('pt','BR'), initialDate: DateTime.now(), firstDate: DateTime(1900), - lastDate: DateTime(DateTime.now().year,12,31) + lastDate: DateTime.now() ); if (pickDate != null) { setState(() { if(type == 'birth'){ - dateDB = '${pickDate.year}-${pickDate.month<10?'0':''}${pickDate.month}-${pickDate.day<10?'0':''}${pickDate.day}'; date = formatData(year: pickDate.year, month: pickDate.month, day: pickDate.day); } @@ -345,7 +344,8 @@ class _RegisterCitizenScreenState extends State { } //ok - if(nameController.text.isEmpty || + if( nameController.text.isEmpty || + !nameController.text.contains(' ') || selectGender==null || selectNaturality==null || selectBreed==null || diff --git a/lib/screens/registers_citizen/register_home_screen.dart b/lib/screens/registers_citizen/register_home_screen.dart index 3eaf118..b06f38a 100644 --- a/lib/screens/registers_citizen/register_home_screen.dart +++ b/lib/screens/registers_citizen/register_home_screen.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:rkm/config/color_palette.dart'; import 'package:rkm/config/const_variable.dart'; +import 'package:rkm/screens/home_screen.dart'; import 'package:rkm/service/db/db_querys.dart'; import 'package:rkm/widgets/button_default.dart'; import 'package:rkm/widgets/title_containers.dart'; @@ -110,9 +111,11 @@ class _RegisterHomeScreenState extends State { escolherprazoInicio(BuildContext context) async { var pickDate = await showDatePicker( context: context, + locale: Locale('pt','BR'), initialDate: DateTime.now(), firstDate: DateTime(2022), - lastDate: DateTime(2025)); + lastDate: DateTime(DateTime.now().year,12,31) + ); if (pickDate != null) { setState(() { date_cad = '${pickDate.year}-${pickDate.month<10?'0':''}${pickDate.month}-${pickDate.day<10?'0':''}${pickDate.day}'; @@ -181,11 +184,11 @@ class _RegisterHomeScreenState extends State { } loadRegisterHome()async{ - ID_DOMICILIO = widget.listData[0]['ID_DOMICILIO']; + ID_DOMICILIO = widget.listData[0]['ID_DOMICILIO']==null || widget.listData[0]['ID_DOMICILIO'] == ''?0:int.parse(widget.listData[0]['ID_DOMICILIO']); ID_CIDADAO = widget.listData[0]['ID_CIDADAO']; CD_USUARIO_SUS = widget.listData[0]['CD_USUARIO_SUS']; DBQuerys().buscaCadDomiciliar(ID_DOMICILIO).then((dataHome)async{ - TIPO_IMOVEL_COD = dataHome[0]['TIPO_IMOVEL']??0; + TIPO_IMOVEL_COD = ID_DOMICILIO==0?0:dataHome[0]['TIPO_IMOVEL']??0; if(dataHome.length!=0){ TIPO_SALVAR = 'update'; } @@ -200,84 +203,84 @@ class _RegisterHomeScreenState extends State { INE_DB = list[0]['INE']; INE = 'INE: $INE_DB / Área: $ID_AREA_DOMICILIO - Microárea : $ID_MICROAREA_DOMICILIO'; listINE.add(INE!); - FORA_AREA = dataHome[0]['FORA_AREA']==1?true:false; - SITUACAO_MORADIA_COD = dataHome[0]['SITUACAO_MORADIA']??0; + FORA_AREA = dataHome.length==0?false:dataHome[0]['FORA_AREA']==1?true:false; + SITUACAO_MORADIA_COD = dataHome.length==0?0:dataHome[0]['SITUACAO_MORADIA']??0; for (int i = 0; ConstVariable().listSituationHome.length > i; i++) { if (ConstVariable().listSituationHome[i].cod == SITUACAO_MORADIA_COD) { SITUACAO_MORADIA = ConstVariable().listSituationHome[i].title; } } - TIPO_LOCALIDADE_COD = dataHome[0]['TIPO_LOCALIDADE']??0; + TIPO_LOCALIDADE_COD = dataHome.length==0?0:dataHome[0]['TIPO_LOCALIDADE']??0; for (int i = 0; ConstVariable().listTypeLocation.length > i; i++) { if (ConstVariable().listTypeLocation[i].cod == TIPO_LOCALIDADE_COD) { TIPO_LOCALIDADE = ConstVariable().listTypeLocation[i].title; } } - TIPO_DOMICILIO_COD = dataHome[0]['TIPO_DOMICILIO']??0; + TIPO_DOMICILIO_COD =dataHome.length==0?0: dataHome[0]['TIPO_DOMICILIO']??0; for (int i = 0; ConstVariable().listTypeResidence.length > i; i++) { if (ConstVariable().listTypeResidence[i].cod == TIPO_DOMICILIO_COD) { TIPO_DOMICILIO = ConstVariable().listTypeResidence[i].title; } } - NUM_MORADORES.text = dataHome[0]['NUM_MORADORES'].toString()=='null'?'':dataHome[0]['NUM_MORADORES'].toString(); - NUM_COMODOS.text = dataHome[0]['NUM_COMODOS'].toString()=='null'?'':dataHome[0]['NUM_COMODOS'].toString(); - SITUACAO_RURAL_COD = dataHome[0]['SITUACAO_RURAL']??0; + NUM_MORADORES.text = dataHome.length==0?'':dataHome[0]['NUM_MORADORES'].toString()=='null'?'':dataHome[0]['NUM_MORADORES'].toString(); + NUM_COMODOS.text = dataHome.length==0?'':dataHome[0]['NUM_COMODOS'].toString()=='null'?'':dataHome[0]['NUM_COMODOS'].toString(); + SITUACAO_RURAL_COD = dataHome.length==0?0:dataHome[0]['SITUACAO_RURAL']??0; for (int i = 0; ConstVariable().listSituationRural.length > i; i++) { if (ConstVariable().listSituationRural[i].cod == SITUACAO_RURAL_COD) { SITUACAO_RURAL = ConstVariable().listSituationRural[i].title; } } - TIPO_ACESSO_COD = dataHome[0]['TIPO_ACESSO']??0; + TIPO_ACESSO_COD = dataHome.length==0?0:dataHome[0]['TIPO_ACESSO']??0; for (int i = 0; ConstVariable().listTypeAcessHome.length > i; i++) { if (ConstVariable().listTypeAcessHome[i].cod == TIPO_ACESSO_COD) { TIPO_ACESSO = ConstVariable().listTypeAcessHome[i].title; } } - MAT_PREDOMINANTE_COD = dataHome[0]['MAT_PREDOMINANTE']??0; + MAT_PREDOMINANTE_COD = dataHome.length==0?0:dataHome[0]['MAT_PREDOMINANTE']??0; for (int i = 0; ConstVariable().listMaterialHome.length > i; i++) { if (ConstVariable().listMaterialHome[i].cod == MAT_PREDOMINANTE_COD) { MAT_PREDOMINANTE = ConstVariable().listMaterialHome[i].title; } } - DISPONIBILIDADE_ENERGIA = dataHome[0]['DISPONIBILIDADE_ENERGIA']==1?true:false; - TIPO_ABASTECIMENTO_COD = dataHome[0]['TIPO_ABASTECIMENTO']??0; + DISPONIBILIDADE_ENERGIA = dataHome.length==0?false:dataHome[0]['DISPONIBILIDADE_ENERGIA']==1?true:false; + TIPO_ABASTECIMENTO_COD = dataHome.length==0?0:dataHome[0]['TIPO_ABASTECIMENTO']??0; for (int i = 0; ConstVariable().listWaterHome.length > i; i++) { if (ConstVariable().listWaterHome[i].cod == TIPO_ACESSO_COD) { TIPO_ABASTECIMENTO = ConstVariable().listWaterHome[i].title; } } - TRATAMENTO_AGUA_COD = dataHome[0]['TRATAMENTO_AGUA']??0; + TRATAMENTO_AGUA_COD = dataHome.length==0?0:dataHome[0]['TRATAMENTO_AGUA']??0; for (int i = 0; ConstVariable().listWaterHome.length > i; i++) { if (ConstVariable().listWaterTreatment[i].cod == TRATAMENTO_AGUA_COD) { TRATAMENTO_AGUA = ConstVariable().listWaterTreatment[i].title; } } - DESTINO_LIXO_COD = dataHome[0]['DESTINO_LIXO']??0; + DESTINO_LIXO_COD = dataHome.length==0?0:dataHome[0]['DESTINO_LIXO']??0; for (int i = 0; ConstVariable().listDestinyTrash.length > i; i++) { if (ConstVariable().listDestinyTrash[i].cod == DESTINO_LIXO_COD) { DESTINO_LIXO = ConstVariable().listDestinyTrash[i].title; } } - ESCOAMENTO_COD = dataHome[0]['ESCOAMENTO']??0; + ESCOAMENTO_COD = dataHome.length==0?0:dataHome[0]['ESCOAMENTO']??0; for (int i = 0; ConstVariable().listSanitary.length > i; i++) { if (ConstVariable().listSanitary[i].cod == ESCOAMENTO_COD) { ESCOAMENTO = ConstVariable().listSanitary[i].title; } } - FL_ANIMAIS = dataHome[0]['FL_ANIMAIS']==1?true:false; - ANIMAIS_GATO = dataHome[0]['ANIMAIS_GATO']==1?true:false; - ANIMAIS_CACHORRO = dataHome[0]['ANIMAIS_CACHORRO']==1?true:false; - ANIMAIS_PASSARO = dataHome[0]['ANIMAIS_PASSARO']==1?true:false; - QTDE_ANIMAIS.text = dataHome[0]['QTDE_ANIMAIS']==null?'':dataHome[0]['QTDE_ANIMAIS'].toString(); - date_cad = dataHome[0]['DT_CADASTRO']??''; + FL_ANIMAIS = dataHome.length==0?false:dataHome[0]['FL_ANIMAIS']==1?true:false; + ANIMAIS_GATO = dataHome.length==0?false:dataHome[0]['ANIMAIS_GATO']==1?true:false; + ANIMAIS_CACHORRO = dataHome.length==0?false:dataHome[0]['ANIMAIS_CACHORRO']==1?true:false; + ANIMAIS_PASSARO = dataHome.length==0?false:dataHome[0]['ANIMAIS_PASSARO']==1?true:false; + QTDE_ANIMAIS.text = dataHome.length==0?'':dataHome[0]['QTDE_ANIMAIS']==null?'':dataHome[0]['QTDE_ANIMAIS'].toString(); + date_cad = dataHome.length==0?'':dataHome[0]['DT_CADASTRO']??''; List splitted = date_cad.toString().split('-'); DT_CADASTRO.text = splitted.length<2?'':'${splitted[2]}/${splitted[1]}/${splitted[0]}'; - ID_EQUIPE = dataHome[0]['ID_EQUIPE']??0; - NOME_INSTITUICAO_PERMANENCIA = dataHome[0]['NOME_INSTITUICAO_PERMANENCIA']; - PROFISSIONAIS_VINCULADOS_INST = dataHome[0]['PROFISSIONAIS_VINCULADOS_INST']; - RESPONSAVEL_TECNICO_INST = dataHome[0]['RESPONSAVEL_TECNICO_INST']; - CARGO_RESP_TECNICO_INST = dataHome[0]['CARGO_RESP_TECNICO_INST']; - TEL_RESP_TECNICO_INST = dataHome[0]['TEL_RESP_TECNICO_INST']; + ID_EQUIPE = dataHome.length==0?0:dataHome[0]['ID_EQUIPE']??0; + NOME_INSTITUICAO_PERMANENCIA = dataHome.length==0?'':dataHome[0]['NOME_INSTITUICAO_PERMANENCIA']; + PROFISSIONAIS_VINCULADOS_INST = dataHome.length==0?'':dataHome[0]['PROFISSIONAIS_VINCULADOS_INST']; + RESPONSAVEL_TECNICO_INST = dataHome.length==0?'':dataHome[0]['RESPONSAVEL_TECNICO_INST']; + CARGO_RESP_TECNICO_INST = dataHome.length==0?'':dataHome[0]['CARGO_RESP_TECNICO_INST']; + TEL_RESP_TECNICO_INST = dataHome.length==0?'':dataHome[0]['TEL_RESP_TECNICO_INST']; await DBQuerys().buscaCBOProfissional(idUsuario).then((list){ if(list.length!=0){ for(int i = 0; list.length>i;i++){ @@ -371,6 +374,7 @@ class _RegisterHomeScreenState extends State { 'Cadastro Domiciliar realizado com sucesso!', 'OK' ); + Navigator.pushAndRemoveUntil(context, MaterialPageRoute(builder: (context)=>HomeScreen(username: widget.username)), (route) => false); // print(value); }); } diff --git a/lib/screens/registers_citizen/register_individual_screen.dart b/lib/screens/registers_citizen/register_individual_screen.dart index 1d12b1d..a4401e7 100644 --- a/lib/screens/registers_citizen/register_individual_screen.dart +++ b/lib/screens/registers_citizen/register_individual_screen.dart @@ -543,6 +543,7 @@ class _RegisterIndividualScreenState extends State { 'HIGIENE_BUCAL' : HIGIENE_BUCAL?1:2, 'OUTROS_HIGIENE' : OUTROS_HIGIENE?1:2, 'FICHA_ALTERACAO' : 1, + //operador 'ID_RESP_CADASTRO' : idUsuario, 'CNES_RESP_CADASTRO' : CNES_RESP_CADASTRO.text, 'CBO_RESP_CADASTRO' : CBO_RESP_CADASTRO, @@ -582,9 +583,11 @@ class _RegisterIndividualScreenState extends State { var pickDate = await showDatePicker( context: context, + locale: Locale('pt','BR'), initialDate: DateTime.now(), firstDate: DateTime(1900), - lastDate: DateTime(2024)); + lastDate: DateTime.now() + ); if (pickDate != null) { if(type=='cadastro'){ date_cad = '${pickDate.year}-${pickDate.month<10?'0':''}${pickDate.month}-${pickDate.day<10?'0':''}${pickDate.day}'; diff --git a/lib/screens/select_service/home_visit_screen.dart b/lib/screens/select_service/home_visit_screen.dart index 294d085..267532b 100644 --- a/lib/screens/select_service/home_visit_screen.dart +++ b/lib/screens/select_service/home_visit_screen.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:line_icons/line_icons.dart'; +import 'package:rkm/screens/home_screen.dart'; import '../../config/color_palette.dart'; import '../../config/const_variable.dart'; import '../../models/check_model.dart'; @@ -85,9 +86,11 @@ class _HomeVisitScreenState extends State { escolherprazoInicio(BuildContext context) async { var pickDate = await showDatePicker( context: context, + locale: Locale('pt','BR'), initialDate: DateTime.now(), firstDate: DateTime(2022), - lastDate: DateTime(2025)); + lastDate: DateTime.now() + ); if (pickDate != null) { setState(() { dateDB = '${pickDate.year}-${pickDate.month<10?'0':''}${pickDate.month}-${pickDate.day<10?'0':''}${pickDate.day}'; @@ -378,6 +381,7 @@ class _HomeVisitScreenState extends State { 'Visita Domiciliar realizada com sucesso!', 'OK' ); + Navigator.pushAndRemoveUntil(context, MaterialPageRoute(builder: (context)=>HomeScreen(username: widget.username)), (route) => false); }); } @@ -578,7 +582,7 @@ class _HomeVisitScreenState extends State { TitleContainers(title: 'Acompanhamento',width: width*0.7,textAling: TextAlign.start,fontSize: 15), Container( width: width*0.7, - height: heigth*1.15, + height: heigth*0.85, child: ListView.builder( physics: const NeverScrollableScrollPhysics(), itemCount: ConstVariable().tipoAcompanhamentoModel.length, diff --git a/lib/screens/select_service/service_home_screen.dart b/lib/screens/select_service/service_home_screen.dart index d4edf3d..fff5ac1 100644 --- a/lib/screens/select_service/service_home_screen.dart +++ b/lib/screens/select_service/service_home_screen.dart @@ -22,6 +22,7 @@ import '../../widgets/input_with_subtitle.dart'; import '../../widgets/onbackbutton.dart'; import '../../widgets/text_default.dart'; import '../../widgets/title_containers.dart'; +import '../home_screen.dart'; class ServiceHomeScreen extends StatefulWidget { String name; @@ -286,6 +287,7 @@ class _ServiceHomeScreenState extends State { 'Atendimento Domiciliar salvo com sucesso!', 'OK' ); + Navigator.pushAndRemoveUntil(context, MaterialPageRoute(builder: (context)=>HomeScreen(username: widget.username)), (route) => false); }); } @@ -531,7 +533,7 @@ class _ServiceHomeScreenState extends State { TitleContainers(title: 'Condição Avaliada',width: width * 0.73), Container( width: width*0.7, - height: heigth*1.3, + height: heigth*0.95, child: ListView.builder( physics: const NeverScrollableScrollPhysics(), itemCount: ConstVariable().serviceHomeCheckConditionlist.length, @@ -633,7 +635,7 @@ class _ServiceHomeScreenState extends State { padding: const EdgeInsets.symmetric(horizontal: 10.0), child: Container( width: width*0.7, - height: heigth*1.2, + height: heigth*0.9, child: ListView.builder( physics: const NeverScrollableScrollPhysics(), itemCount: ConstVariable().serviceHomeCheckProclist.length, diff --git a/lib/service/api/api_data_load.dart b/lib/service/api/api_data_load.dart index b4928d2..27d3ced 100644 --- a/lib/service/api/api_data_load.dart +++ b/lib/service/api/api_data_load.dart @@ -6,7 +6,7 @@ class ApiDataLoad{ //http://192.168.0.42:8010/api/atb/desenvolvimento/corumbatai/pass/admin //https://app0.rkmsistemas.com.br/api/atb/homologacao/cabreuva/pass/admin final url = '${urlAPI}${mode}/${nameCityApi}/pass/${user}'; - print(url); + // print(url); final response = await http.get(Uri.parse(url)); var map; print(response.statusCode); diff --git a/lib/service/db/db_sqlite_sync.dart b/lib/service/db/db_sqlite_sync.dart index c543092..855ffd2 100644 --- a/lib/service/db/db_sqlite_sync.dart +++ b/lib/service/db/db_sqlite_sync.dart @@ -168,17 +168,15 @@ class DbSqliteSync{ return db; } Future insertCidadaos(var value,String type,String CD_USUARIO_SUS)async{ - //para a carga inicial o datalista funciona - List dataLista = value; - //testar depois ao incluir um novo cidadao se precisara do map data - // Map data = value; List> rows = []; Database db = await DbSqliteLoad().intialDB(); Batch batch = db.batch(); if(type=='sync'){ - for (int i = 0; i < dataLista.length; i++) { + //para a carga inicial o datalista funciona + List dataList = value; + for (int i = 0; i < dataList.length; i++) { Map row = { 'ID_CIDADAO' : value[i]['idCidadao'], 'CD_USUARIO_SUS' : value[i]['cdUsuarioSus'], @@ -274,10 +272,14 @@ class DbSqliteSync{ List> CIDADAOS = await db.query('CIDADAOS'); print('Total de CIDADAOS : ${CIDADAOS.length}'); }else if(type=='new'){ - int id = await db.insert('CIDADAOS', value); + //testar depois ao incluir um novo cidadao se precisara do map data + Map dataMap = value; + int id = await db.insert('CIDADAOS', dataMap); // print('novo id $id'); }else if(type=='update'){ - await db.update('CIDADAOS', value,where: "CD_USUARIO_SUS = '$CD_USUARIO_SUS'"); + //testar depois ao incluir um novo cidadao se precisara do map data + Map dataMap = value; + await db.update('CIDADAOS', dataMap,where: "CD_USUARIO_SUS = '$CD_USUARIO_SUS'"); } return db; } diff --git a/lib/widgets/input_text.dart b/lib/widgets/input_text.dart index fb0fb41..b9dfc10 100644 --- a/lib/widgets/input_text.dart +++ b/lib/widgets/input_text.dart @@ -32,7 +32,7 @@ class InputText extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - color: enabled?ColorPalette.white:ColorPalette.disable, + color: enabled?Colors.grey[200]:ColorPalette.disable, width: width, margin: EdgeInsets.only(bottom: 5), child: TextFormField( diff --git a/lib/widgets/input_with_subtitle.dart b/lib/widgets/input_with_subtitle.dart index a649811..4b0d76c 100644 --- a/lib/widgets/input_with_subtitle.dart +++ b/lib/widgets/input_with_subtitle.dart @@ -12,7 +12,7 @@ class InputWithSubtitle extends StatelessWidget { double widthSubtitle; double widthInput; double widthError; - var controller; + TextEditingController controller; var onChanged; bool enabled; bool mandatory; @@ -41,19 +41,12 @@ class InputWithSubtitle extends StatelessWidget { @override Widget build(BuildContext context) { + + List splited = controller.text.trim().split(' '); + return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - // Container( - // width: widthSubtitle, - // padding: const EdgeInsets.symmetric(horizontal: 8.0,vertical: 3), - // child: TextDefault( - // text: subtitle, - // color: ColorPalette.black54, - // fontSize: 18, - // fontWeigth: FontWeight.bold, - // ), - // ), TitleInput(title:labelInput), InputText( controller: controller, @@ -65,7 +58,7 @@ class InputWithSubtitle extends StatelessWidget { colorBorder: colorBorder, onChanged: onChanged, ), - typeInput=='normal'&& controller.text=='' &&(enabled&&mandatory)?ErrorDefault(widthDefault: widthError,error: errorInput,):Container(), + typeInput=='normal'&&(enabled&&mandatory) && (labelInput=='Nome' && splited.length<=1) ?ErrorDefault(widthDefault: widthError,error: errorInput,):Container(), typeInput!='normal'&&(enabled&&mandatory)&& errorInput!=''?ErrorDefault(widthDefault: widthError,error: errorInput,):Container(), Divider(color: ColorPalette.black54,height: 5,endIndent: 10,) ],