rodrigo_car/rkmmobile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

versão 1.0.12+13 AJUSTE DE ID E DESCRIÇÃO DE AREA E MICROAREA, AJUSTE DA MENSAGEM DADOS SALVOS DA EDIÇÃO DO PACIENTE.

Browse Source
This commit is contained in:
Reginaldo
2024-08-26 16:37:01 -03:00
parent 612eb9da02
commit 48a5a779bf
14 changed files with 111 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/screens/login/login_saved_screen.dart
View File

@@ -79,6 +79,8 @@ class _LoginSavedScreenState extends State<LoginSavedScreen> {
@override
void initState() {
super.initState();
// print('dados');
// print(widget.listControl);
recupDB();
}
@@ -192,7 +194,7 @@ class _LoginSavedScreenState extends State<LoginSavedScreen> {
padding: EdgeInsets.symmetric(vertical: 5),
width: width*0.6,
child: TextDefault(
text: 'Área: '+widget.listControl[0]['AREA'].toString()+' - Microárea: '+widget.listControl[0]['MICROAREA'].toString(),
text: 'Área: '+widget.listControl[0]['AREA_DESCRICAO'].toString()+' - Microárea: '+widget.listControl[0]['MICROAREA_DESCRICAO'].toString(),
fontWeigth: FontWeight.bold,
color: Colors.black,
textAlign: TextAlign.center,

22
lib/screens/login/sync_login_screen.dart
View File

@@ -138,7 +138,11 @@ class _SyncLoginScreenState extends State<SyncLoginScreen> {
for(int i=0; listUnit.length > i;i++){
if(listUnit[i] == selectUnit){
idUnidade = searchUnitCodList[i].toString();
_prefService.createCacheUnidade(idUnidade,selectUnit!);
print('idUnidade: $idUnidade / select $selectUnit');
_prefService.createCacheUnidade(idUnidade,selectUnit!).then((onValue){
print('onValeu ${onValue.toString()}');
});
break;
}
}
if(idUnidade!=''){
@@ -253,7 +257,10 @@ class _SyncLoginScreenState extends State<SyncLoginScreen> {
validatorDropDown = true;
selectTeam = null;
});
getTeam();
_prefService.removeUnidade().then((onValue){
print('remove unidade');
getTeam();
});
},
),
TitleInput(title:'Equipe'),
@@ -265,7 +272,18 @@ class _SyncLoginScreenState extends State<SyncLoginScreen> {
onChanged: (value){
setState(() {
selectTeam = value!;
print('ID_ATB_AREA');
print(selectTeam!.ID_ATB_AREA.toString());
print('AREA');
print(selectTeam!.AREA.toString());
print('ID_ATB_MICROAREA');
print(selectTeam!.ID_ATB_MICROAREA.toString());
print('MICROAREA');
print(selectTeam!.MICROAREA.toString());
print('UNIDADE');
print(selectTeam!.ID_UNIDADE.toString());
print('EQUIPE');
print(selectTeam!.ID_EQUIPE.toString());
});
},
),

28
lib/screens/registers_citizen/register_citizen_screen.dart
View File

@@ -2,6 +2,7 @@ import 'package:brasil_fields/brasil_fields.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:intl/intl.dart';
import 'package:mask_text_input_formatter/mask_text_input_formatter.dart';
import 'package:rkm/config/color_palette.dart';
import 'package:rkm/config/const_variable.dart';
import 'package:rkm/models/drop_down_data_string_model.dart';
@@ -222,7 +223,7 @@ class _RegisterCitizenScreenState extends State<RegisterCitizenScreen> {
List listControl = await db.rawQuery(queryControl);
final PrefService _prefService = PrefService();
_prefService.readCacheUnidade().then((listUnidade)async{
idUnidade =listUnidade[0];
idUnidade =listUnidade[0].toString();
});
setState(() {
unitController.text = listControl[0]['NOME_UNIDADE'];
@@ -459,10 +460,10 @@ class _RegisterCitizenScreenState extends State<RegisterCitizenScreen> {
'NUM_RECADO' : messageController.text.isNotEmpty?int.parse(messageController.text):0,
'EMAIL' : emailController.text,
'OBSERVACOES' : observationController.text,
'CPF' : CPFController.text.isNotEmpty?int.parse(CPFController.text):0,
'CPF' : CPFController.text.isNotEmpty?int.parse(CPFController.text.replaceAll('.', '').replaceAll('-', '')):0,
'CNS' : checkCNS == 'ok'&& CNSController.text.isNotEmpty?int.parse(CNSController.text):999999999999999,
'TITULO_ELEITOR' : voterController.text,
'RG_NUMERO' : RGController.text.isNotEmpty?int.parse(RGController.text):0,
'RG_NUMERO' : RGController.text.isNotEmpty && RGController.text!='null'?int.parse(RGController.text):0,
'RG_COMPLEMENTO' : RGComplementController.text,
'RG_UF' : selectRGUF,
'RG_ORGAO' : RGOrganController.text,
@@ -649,7 +650,7 @@ class _RegisterCitizenScreenState extends State<RegisterCitizenScreen> {
}
List listTypeStreet = await DBQuerys().buscaTipoLogradouroPorId(idTipo);
selectTypeStreet = listTypeStreet[0]['NO_LOGR_TIPO'];
cepController.text = widget.listData[0]['CEP_LOGR'].toString()=='null'?'': widget.listData[0]['CEP_LOGR'].toString();
cepController.text = widget.listData[0]['CEP_LOGR'].toString()=='null'?'': cepfMaskFormatter.maskText(widget.listData[0]['CEP_LOGR'].toString());
numberController.text = widget.listData[0]['NUMERO_LOGR'].toString()??'';
// print('numberController');
// print(numberController.text);
@@ -674,12 +675,12 @@ class _RegisterCitizenScreenState extends State<RegisterCitizenScreen> {
messageController.text = widget.listData[0]['NUM_RECADO'].toString()=='null'?'':widget.listData[0]['NUM_RECADO'].toString();
emailController.text = widget.listData[0]['EMAIL'];
observationController.text = widget.listData[0]['OBSERVACOES'];
CPFController.text = widget.listData[0]['CPF'].toString();
CPFController.text = cpfMaskFormatter.maskText(widget.listData[0]['CPF'].toString());
CNSController.text = widget.listData[0]['CNS'];
voterController.text = widget.listData[0]['TITULO_ELEITOR']==null?'':widget.listData[0]['TITULO_ELEITOR'].toString()??'';
RGController.text = widget.listData[0]['RG_NUMERO'].toString()=='null'?'':widget.listData[0]['RG_NUMERO'].toString();
RGComplementController.text = widget.listData[0]['RG_COMPLEMENTO'].toString();
selectRGUF = widget.listData[0]['RG_UF']??'';
RGController.text = widget.listData[0]['RG_NUMERO'].toString()==null?'':widget.listData[0]['RG_NUMERO'].toString();
RGComplementController.text = widget.listData[0]['RG_COMPLEMENTO'].toString()==null?'':widget.listData[0]['RG_COMPLEMENTO'].toString();
selectRGUF = widget.listData[0]['RG_UF']??'--';
RGOrganController.text = widget.listData[0]['RG_ORGAO']==null?'':widget.listData[0]['RG_ORGAO'];
RGDateController.text = widget.listData[0]['RG_DATA_EMISSAO']==null?'':widget.listData[0]['RG_DATA_EMISSAO'];
RGDateDB = RGDateController.text;
@@ -718,6 +719,15 @@ class _RegisterCitizenScreenState extends State<RegisterCitizenScreen> {
setState(() {});
}
var cpfMaskFormatter = MaskTextInputFormatter(
mask: '###.###.###-##',
filter: { "#": RegExp(r'[0-9]') },
);
var cepfMaskFormatter = MaskTextInputFormatter(
mask: '##.###-###',
filter: { "#": RegExp(r'[0-9]') },
);
@override
void initState() {
super.initState();
@@ -739,7 +749,7 @@ class _RegisterCitizenScreenState extends State<RegisterCitizenScreen> {
double width = MediaQuery.of(context).size.width;
return WillPopScope(
onWillPop: () async => await OnBackButton().onBackButton(context, widget.username),
onWillPop:showTab?null: () async => await OnBackButton().onBackButton(context, widget.username),
child: Scaffold(
appBar: AppBarDefault().appbar(context, 'RKM AB - Cadastro Cidadão',widget.username),
body: Container(

3
lib/screens/registers_citizen/register_home_screen.dart
View File

@@ -150,7 +150,7 @@ class _RegisterHomeScreenState extends State<RegisterHomeScreen> {
});
_prefService.readCacheUnidade().then((value){
if(value!=null){
idUnidade = value[0];
idUnidade = value[0].toString();
nomeUnidade = value[1];
}
loadLists();
@@ -445,6 +445,7 @@ class _RegisterHomeScreenState extends State<RegisterHomeScreen> {
'Cadastro Domiciliar realizado com sucesso!',
'OK'
);
Navigator.pushAndRemoveUntil(context, MaterialPageRoute(builder: (context)=>HomeScreen(username: widget.username)), (route) => false);
// print(value);
});

4
lib/screens/registers_citizen/register_individual_screen.dart
View File

@@ -177,7 +177,7 @@ class _RegisterIndividualScreenState extends State<RegisterIndividualScreen> {
});
_prefService.readCacheUnidade().then((value){
if(value!=null){
idUnidade = value[0];
idUnidade = value[0].toString();
nomeUnidade = value[1];
}
loadLists();
@@ -653,7 +653,7 @@ class _RegisterIndividualScreenState extends State<RegisterIndividualScreen> {
double width = MediaQuery.of(context).size.width;
return WillPopScope(
onWillPop: ()async=> await OnBackButton().onBackButton(context, widget.username),
onWillPop: showTab?null:()async=> await OnBackButton().onBackButton(context, widget.username),
child: Scaffold(
appBar: AppBarDefault().appbar(context, 'RKM AB - Cadastro Individual',widget.username),
body: Container(

2
lib/screens/select_service/atendimento_domiciliar_tela.dart
View File

@@ -147,7 +147,7 @@ class _AtendimentoDomiciliarTelaState extends State<AtendimentoDomiciliarTela> {
});
_prefService.readCacheUnidade().then((value){
if(value!=null){
idUnidade = value[0];
idUnidade = value[0].toString();
CNES_UNIDADE.text = value[1];
}
});

2
lib/screens/select_service/visita_domiciliar_tela.dart
View File

@@ -123,7 +123,7 @@ class _VisitaDomiciliarTelaState extends State<VisitaDomiciliarTela> {
});
_prefService.readCacheUnidade().then((value){
if(value!=null){
idUnidade = value[0];
idUnidade = value[0].toString();
CNES_UNIDADE.text = value[1];
}
});

1
lib/screens/splash_screen.dart
View File

@@ -39,6 +39,7 @@ class _SplashScreenState extends State<SplashScreen> {
if(dataControl.length != 0){
var query = "SELECT * FROM CONTROLE_INTERNO";
dataControl = await db.rawQuery(query);
print(dataControl);
String? url;
if(list[3]=='desenvolvimento'){
url = UrlApiConst.ApiUrlDesenvolvimento;

28
lib/screens/sync_init_screen.dart
View File

@@ -26,8 +26,10 @@ class _SyncInitScreenState extends State<SyncInitScreen> {
String idUsuario = '';
String idUnidade = '';
String nomeUnidade = '';
int idArea = 0;
int idMicroarea = 0;
int AREA_ID = 0;
int AREA_DESCRICAO = 0;
int MICROAREA_ID = 0;
int MICROAREA_DESCRICAO = 0;
bool foraArea = false;
int foraAreaInt = 0;
String urlAPI='';
@@ -58,6 +60,7 @@ class _SyncInitScreenState extends State<SyncInitScreen> {
codState = list[0]['COD_STATE'];
codCityIbge = list[0]['COD_IBGE'];
if(urlAPI!=''){
print('chegou');
dataUser();
}
});
@@ -65,13 +68,18 @@ class _SyncInitScreenState extends State<SyncInitScreen> {
dataUser()async{
_prefService.readCacheUnidade().then((listUnidade)async{
print('listUnidade');
print(listUnidade);
_prefService.readCacheSync().then((list){
print('datauser');
print(list);
foraArea = list[8];
AREA_ID = list[0];
AREA_DESCRICAO = list[1];
MICROAREA_ID = list[2];
MICROAREA_DESCRICAO = list[3];
foraArea = list[9];
foraAreaInt = foraArea?1:0;
idArea = list[2];
idMicroarea = list[4];
idUnidade = listUnidade[0].toString();
idUnidade = list[5].toString();
nomeUnidade = listUnidade[1];
initSync();
});
@@ -132,7 +140,7 @@ class _SyncInitScreenState extends State<SyncInitScreen> {
await DbSqliteSync().insertProfissionaisCBOs(value).then((value)async{
countProg = 0.7;
setState(() {});
await ApiDataSync().syncCidadaos(urlAPI,mode,nameCityApi,user,idUnidade,idArea,idMicroarea,foraAreaInt).then((value)async{
await ApiDataSync().syncCidadaos(urlAPI,mode,nameCityApi,user,idUnidade,AREA_ID,MICROAREA_ID,foraAreaInt).then((value)async{
if(value.length == 0){
setState(()=> messageSteps = "ERRO: Erro para carregar os Cadastros dos Cidadãos - Por favor, tente novamente!");
}else{
@@ -140,7 +148,7 @@ class _SyncInitScreenState extends State<SyncInitScreen> {
await DbSqliteSync().insertCidadaos(value,'sync','').then((value)async{
countProg = 0.8;
setState(() {});
await ApiDataSync().syncCadastrosDomiciliares(urlAPI,mode,nameCityApi,user,idUnidade,idArea,idMicroarea,foraAreaInt).then((value)async{
await ApiDataSync().syncCadastrosDomiciliares(urlAPI,mode,nameCityApi,user,idUnidade,AREA_ID,MICROAREA_ID,foraAreaInt).then((value)async{
if(value.length == 0){
setState(()=> messageSteps = "ERRO: Erro para carregar os Cadastros Domiciliares - Por favor, tente novamente!");
}else{
@@ -148,13 +156,13 @@ class _SyncInitScreenState extends State<SyncInitScreen> {
await DbSqliteSync().insertCadastrosDomiciliares(value,'sync',0,0,'').then((value)async{
countProg = 0.9;
setState(() {});
await ApiDataSync().syncCadastrosIndividuais(urlAPI,mode,nameCityApi,user,idUnidade,idArea,idMicroarea,foraAreaInt).then((value)async{
await ApiDataSync().syncCadastrosIndividuais(urlAPI,mode,nameCityApi,user,idUnidade,AREA_ID,MICROAREA_ID,foraAreaInt).then((value)async{
if(value.length == 0){
setState(()=> messageSteps = "ERRO: Erro para carregar os Cadastros Individuais - Por favor, tente novamente!");
}else{
setState(()=> messageSteps = "Etapa 10 de 10 - Gravando os Cadastros Individuais no Aplicativo");
await DbSqliteSync().insertCadastrosIndividuais(value,'sync',0).then((value)async{
await DbSqliteSync().saveSync(codCity,codState,urlAPI,mode,nameCityApi,nameCityFront,codCityIbge,user,idUnidade,nomeUnidade,idArea,idMicroarea).then((value)async{
await DbSqliteSync().saveSync(codCity,codState,urlAPI,mode,nameCityApi,nameCityFront,codCityIbge,user,idUnidade,nomeUnidade,AREA_ID,AREA_DESCRICAO,MICROAREA_ID,MICROAREA_DESCRICAO).then((value)async{
countProg = 1;
setState(() {});
Navigator.pushReplacement(context, MaterialPageRoute(builder: (context)=>HomeScreen(username: user)));