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

ajustes em diversos pontos do app para receber o username, e ajustar para exibir apenas as telas que realmente será utilizado no app.

Browse Source
This commit is contained in:
Reginaldo
2024-02-01 17:01:08 -03:00
parent cfdfb316f8
commit 2450a76f4b
31 changed files with 227 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
lib/widgets/alert_dialog_default.dart
View File

@@ -1,7 +1,13 @@
import 'package:flutter/material.dart';
import 'package:rkm/config/color_palette.dart';
import 'package:rkm/config/const_variable.dart';
import 'package:rkm/screens/select_service/complementary_sheet_screen.dart';
import 'package:rkm/screens/select_service/consumption_markers_screen.dart';
import 'package:rkm/screens/select_service/eligibility_assessment_screen.dart';
import 'package:rkm/screens/select_service/procedures_screen.dart';
import 'package:rkm/screens/select_service/service_dental_screen.dart';
import 'package:rkm/screens/select_service/service_home_screen.dart';
import 'package:rkm/screens/select_service/service_individual_screen.dart';
import 'package:rkm/widgets/button_default.dart';
import 'package:rkm/widgets/switch_with_subtitle.dart';
import 'package:rkm/widgets/text_default.dart';
@@ -78,29 +84,19 @@ class AlertDialogDefault {
);
}
alertSelect(BuildContext context,String name) {
alertSelect(BuildContext context,String name,String username, var dataPatient) {
//Cadastro e edição do Cadastro do Cidadão, Cadastro Individual, Cadastro Domiciliar e Visita Domiciliar
List list = [
'Atendimento Domiciliar',
'Atendimento Individual',
'Atendimento Odontológico',
'Avaliação de Elegibilidade',
'Ficha Complementar',
'Marcadores de Consumo',
'Procedimentos',
// 'Atendimento Individual',
// 'Atendimento Odontológico',
// 'Avaliação de Elegibilidade',
// 'Ficha Complementar',
// 'Marcadores de Consumo',
// 'Procedimentos',
'Visita domiciliar',
];
List routes = [
'/service_home',
'/service_individual',
'/service_dental',
'/eligibility_assessment',
'/complementary_sheet',
'/consumption_markers',
'/procedures',
'/home_visit',
];
double width = MediaQuery.of(context).size.width;
double height = MediaQuery.of(context).size.height;
@@ -125,18 +121,51 @@ class AlertDialogDefault {
return ListTile(
onTap: (){
Navigator.pop(context);
if(index==0){
Navigator.push(
context,
MaterialPageRoute(builder:(context) => ServiceHomeScreen(name: name,)),
MaterialPageRoute(builder:(context) => ServiceHomeScreen(name: name,username: username,)),
);
}else if(index == 1){
Navigator.push(
context,
MaterialPageRoute(builder:(context) => HomeVisitScreen(name: name,username: username,)),
);
// Navigator.push(
// context,
// MaterialPageRoute(builder:(context) => ServiceIndividualScreen(username: username,dataPatient: dataPatient,)),
// );
}else if(index == 2){
Navigator.push(
context,
MaterialPageRoute(builder:(context) => ServiceDentalScreen(username: username,)),
);
}else if(index == 3){
Navigator.push(
context,
MaterialPageRoute(builder:(context) => EligibilityAssessmentScreen(username: username,)),
);
}else if(index == 4){
Navigator.push(
context,
MaterialPageRoute(builder:(context) => ComplementarySheetScreen(username: username,)),
);
}else if(index == 5){
Navigator.push(
context,
MaterialPageRoute(builder:(context) => ConsumptionMarkersScreen(username: username,)),
);
}else if(index == 6){
Navigator.push(
context,
MaterialPageRoute(builder:(context) => ProceduresScreen(username: username,)),
);
}else if (index==7){
Navigator.push(
context,
MaterialPageRoute(builder:(context) => HomeVisitScreen(name: name,)),
MaterialPageRoute(builder:(context) => HomeVisitScreen(name: name,username: username,)),
);
}else{
Navigator.pushNamed(context, routes[index]);
}
},
tileColor: rest==0?ColorPalette.white:ColorPalette.appBar,

14
lib/widgets/alert_dialog_settings.dart
View File

@@ -1,12 +1,16 @@
import 'package:flutter/material.dart';
import 'package:rkm/config/const_variable.dart';
import 'package:rkm/screens/configurations/clear_data_screen.dart';
import 'package:rkm/screens/configurations/import_sigtap_screen.dart';
import 'package:rkm/screens/configurations/main_procedures_screen.dart';
import 'package:rkm/screens/configurations/sync_data_screen.dart';
import 'package:rkm/widgets/button_default.dart';
import 'package:rkm/widgets/item_alert_settings.dart';
import 'package:rkm/widgets/text_default.dart';
class AlertDialogSettings {
@override
alert(BuildContext context) {
alert(BuildContext context, String username) {
return showDialog(
context: context,
builder: (context){
@@ -21,7 +25,7 @@ class AlertDialogSettings {
ItemAlertSettings(
onTap: (){
Navigator.pop(context);
Navigator.pushNamed(context, '/import_sigtap');
Navigator.push(context,MaterialPageRoute(builder: (context) => ImportSigtapScreen(username: username,)));
},
title: 'Importar SIGTAP',
body: 'Atulizar as informações do SIGTAP no aplicativo\n'
@@ -31,7 +35,7 @@ class AlertDialogSettings {
ItemAlertSettings(
onTap: (){
Navigator.pop(context);
Navigator.pushNamed(context, '/clear_data');
Navigator.push(context,MaterialPageRoute(builder:(context) => ClearDataScreen(username: username,)));
},
title: 'Limpar Dados',
body: 'Apaga todos os dados do Aplicativo.\n'
@@ -43,7 +47,7 @@ class AlertDialogSettings {
ItemAlertSettings(
onTap: (){
Navigator.pop(context);
Navigator.pushNamed(context, '/main_procedures');
Navigator.push(context,MaterialPageRoute(builder:(context) => MainProceduresScreen(username:username,)));
},
title: 'Definir Procedimentos Iniciais',
body: 'Define os Procedimentos iniciais que deverão ser\n'
@@ -62,7 +66,7 @@ class AlertDialogSettings {
ItemAlertSettings(
onTap: (){
Navigator.pop(context);
Navigator.pushNamed(context, '/sinc_data');
Navigator.push(context,MaterialPageRoute(builder:(context) => SyncDataScreen(username: username,)));
},
title: 'Sincronia de Envio',
body: 'Efetua a Sincronia de Envio levandoas informações\n'

4
lib/widgets/appbar_default.dart
View File

@@ -8,7 +8,7 @@ import 'icon_button_default.dart';
class AppBarDefault{
@override
PreferredSize appbar(BuildContext context,String title) {
PreferredSize appbar(BuildContext context,String title, String username) {
return PreferredSize(
preferredSize: Size.fromHeight(50),
child: AppBar(
@@ -19,7 +19,7 @@ class AppBarDefault{
IconButtonDefault(
icon: Icons.settings,
color: ColorPalette.white,
onPressed: ()=>AlertDialogSettings().alert(context)
onPressed: ()=>AlertDialogSettings().alert(context,username)
),
IconButtonDefault(
icon: Icons.logout,

6
lib/widgets/item_citizen.dart
View File

@@ -13,6 +13,8 @@ class ItemCitizen extends StatelessWidget {
String numberCNS;
String numberMedicalRecord;
var onTap;
String username;
var dataPatient;
ItemCitizen({
required this.name,
@@ -21,6 +23,8 @@ class ItemCitizen extends StatelessWidget {
required this.numberCNS,
required this.numberMedicalRecord,
required this.onTap,
required this.username,
required this.dataPatient
});
@override
@@ -35,7 +39,7 @@ class ItemCitizen extends StatelessWidget {
subtitle: TextDefault(text: '$numberCNS - $numberMedicalRecord - $date - $mother',fontSize: 13,color: Colors.black54),
trailing: IconButton(
icon: Icon(LineIcons.clipboard,size: 35,),
onPressed: ()=>AlertDialogDefault().alertSelect(context,name),
onPressed: ()=>AlertDialogDefault().alertSelect(context,name,username,dataPatient),
),
onTap: onTap,
),

5
lib/widgets/onbackbutton.dart
View File

@@ -1,10 +1,11 @@
import 'package:flutter/material.dart';
import 'package:rkm/screens/home_screen.dart';
import 'package:rkm/widgets/text_default.dart';
import '../config/color_palette.dart';
import 'button_default.dart';
class OnBackButton{
onBackButton(context)async {
onBackButton(context,String username)async {
await showDialog(
context: context,
builder: (context){
@@ -13,7 +14,7 @@ class OnBackButton{
content: TextDefault(text: 'Deseja sair e descartar as alterações?',color: ColorPalette.black54,),
actions: [
ButtonDefault(
onPressed: ()=>Navigator.pushNamedAndRemoveUntil(context, '/home', (route) => false),
onPressed: ()=>Navigator.pushAndRemoveUntil(context,MaterialPageRoute(builder:(context)=> HomeScreen(username: username,)), (route) => false),
title: 'Sim',
background: ColorPalette.appBar,
borderColor: ColorPalette.appBar,

1
lib/widgets/screen_dev.dart
View File

@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import '../config/const_variable.dart';
class ScreenDev extends StatefulWidget {

10
lib/widgets/subtitle_appbar_citizen.dart
View File

@@ -9,11 +9,13 @@ class SubtitleAppbarCitizen extends StatelessWidget {
int title;
bool edit;
List listData;
String username;
SubtitleAppbarCitizen({
required this.title,
this.edit = false,
required this.listData
required this.listData,
required this.username
});
@override
@@ -31,7 +33,7 @@ class SubtitleAppbarCitizen extends StatelessWidget {
TextButton.icon(
onPressed:edit? ()=> Navigator.push(
context,
MaterialPageRoute(builder: (context) => RegisterCitizenScreen(listData: this.listData,)),
MaterialPageRoute(builder: (context) => RegisterCitizenScreen(listData: this.listData,username: this.username,)),
):null,
icon: Icon(Icons.person,color: title==1?Colors.black:ColorPalette.gray,),
label: TextDefault(text: 'Cadastro Cidadão',fontSize: 14,color: title==1?Colors.black:ColorPalette.gray,)
@@ -39,7 +41,7 @@ class SubtitleAppbarCitizen extends StatelessWidget {
TextButton.icon(
onPressed:edit? ()=> Navigator.push(
context,
MaterialPageRoute(builder: (context) => RegisterIndividualScreen(listData: this.listData,)),
MaterialPageRoute(builder: (context) => RegisterIndividualScreen(listData: this.listData,username: this.username)),
):null,
icon: Icon(Icons.assignment_outlined,color: title==2?Colors.black:ColorPalette.gray,),
label: TextDefault(text: 'Cadastro Individual',fontSize: 14,color: title==2?Colors.black:ColorPalette.gray,)
@@ -47,7 +49,7 @@ class SubtitleAppbarCitizen extends StatelessWidget {
TextButton.icon(
onPressed:edit? ()=> Navigator.push(
context,
MaterialPageRoute(builder: (context) => RegisterHomeScreen(listData: this.listData,)),
MaterialPageRoute(builder: (context) => RegisterHomeScreen(listData: this.listData,username: this.username)),
):null,
icon: Icon(Icons.home,color: title==3?Colors.black:ColorPalette.gray,),
label: TextDefault(text: 'Cadastro Domiciliar',fontSize: 14,color: title==3?Colors.black:ColorPalette.gray,)