Merge branch 'flutterflow' into fd-601
This commit is contained in:
Ivan Antunes
commit
a379d7f352
|
|
@ -51,8 +51,8 @@
|
||||||
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
|
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
|
||||||
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
||||||
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
||||||
6436409727A31CD700820AF7 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/InfoPlist.strings; sourceTree = "<group>"; };
|
6436409227A31CDD00820AF7 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/InfoPlist.strings; sourceTree = "<group>"; };
|
||||||
6436409927A31CD900820AF7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
|
6436409B27A31CD600820AF7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
|
||||||
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||||
C1B4A503715BC7B0F8826983 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
|
C1B4A503715BC7B0F8826983 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
|
||||||
/* End PBXFileReference section */
|
/* End PBXFileReference section */
|
||||||
|
|
@ -301,8 +301,8 @@
|
||||||
6436409C27A31CD800820AF7 /* InfoPlist.strings */ = {
|
6436409C27A31CD800820AF7 /* InfoPlist.strings */ = {
|
||||||
isa = PBXVariantGroup;
|
isa = PBXVariantGroup;
|
||||||
children = (
|
children = (
|
||||||
6436409727A31CD700820AF7 /* pt */,
|
6436409227A31CDD00820AF7 /* pt */,
|
||||||
6436409927A31CD900820AF7 /* en */,
|
6436409B27A31CD600820AF7 /* en */,
|
||||||
);
|
);
|
||||||
name = InfoPlist.strings;
|
name = InfoPlist.strings;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
|
|
||||||
|
|
@ -258,7 +258,7 @@ class _ScheduleProvisionalVisitPageWidgetState
|
||||||
alignment: const AlignmentDirectional(-1.0, 0.0),
|
alignment: const AlignmentDirectional(-1.0, 0.0),
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsetsDirectional.fromSTEB(
|
padding: const EdgeInsetsDirectional.fromSTEB(
|
||||||
24.0, 0.0, 0.0, 0.0),
|
24.0, 10.0, 0.0, 10.0),
|
||||||
child: Text(
|
child: Text(
|
||||||
FFLocalizations.of(context).getText(
|
FFLocalizations.of(context).getText(
|
||||||
'z6aawgqa' /* Dados da Visita */,
|
'z6aawgqa' /* Dados da Visita */,
|
||||||
|
|
@ -768,45 +768,141 @@ class _ScheduleProvisionalVisitPageWidgetState
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
Column(
|
Padding(
|
||||||
mainAxisSize: MainAxisSize.max,
|
padding: const EdgeInsetsDirectional.fromSTEB(
|
||||||
children: [
|
0.0, 10.0, 0.0, 10.0),
|
||||||
Align(
|
child: Column(
|
||||||
alignment:
|
mainAxisSize: MainAxisSize.max,
|
||||||
const AlignmentDirectional(0.0, 0.0),
|
children: [
|
||||||
child: Container(
|
Align(
|
||||||
height: 80.0,
|
|
||||||
decoration: const BoxDecoration(),
|
|
||||||
alignment:
|
alignment:
|
||||||
const AlignmentDirectional(0.0, 0.0),
|
const AlignmentDirectional(0.0, 0.0),
|
||||||
child: Align(
|
child: Container(
|
||||||
|
decoration: const BoxDecoration(),
|
||||||
alignment:
|
alignment:
|
||||||
const AlignmentDirectional(0.0, 0.0),
|
const AlignmentDirectional(0.0, 0.0),
|
||||||
child: Padding(
|
child: Align(
|
||||||
padding: const EdgeInsetsDirectional
|
alignment: const AlignmentDirectional(
|
||||||
.fromSTEB(
|
0.0, 0.0),
|
||||||
24.0, 0.0, 24.0, 0.0),
|
child: Padding(
|
||||||
child: SizedBox(
|
padding: const EdgeInsetsDirectional
|
||||||
width: double.infinity,
|
.fromSTEB(
|
||||||
child: TextFormField(
|
24.0, 0.0, 24.0, 0.0),
|
||||||
controller: _model
|
child: SizedBox(
|
||||||
.notesTextController,
|
width: double.infinity,
|
||||||
focusNode:
|
child: TextFormField(
|
||||||
_model.notesFocusNode,
|
controller: _model
|
||||||
autofocus: false,
|
.notesTextController,
|
||||||
textInputAction:
|
focusNode:
|
||||||
TextInputAction.next,
|
_model.notesFocusNode,
|
||||||
obscureText: false,
|
autofocus: false,
|
||||||
decoration: InputDecoration(
|
textInputAction:
|
||||||
isDense: false,
|
TextInputAction.next,
|
||||||
labelText:
|
obscureText: false,
|
||||||
FFLocalizations.of(
|
decoration: InputDecoration(
|
||||||
context)
|
isDense: false,
|
||||||
.getText(
|
labelText:
|
||||||
'cw8b3tbb' /* Observação da Visita */,
|
FFLocalizations.of(
|
||||||
|
context)
|
||||||
|
.getText(
|
||||||
|
'cw8b3tbb' /* Observação da Visita */,
|
||||||
|
),
|
||||||
|
labelStyle:
|
||||||
|
FlutterFlowTheme.of(
|
||||||
|
context)
|
||||||
|
.bodyMedium
|
||||||
|
.override(
|
||||||
|
fontFamily: FlutterFlowTheme.of(
|
||||||
|
context)
|
||||||
|
.bodyMediumFamily,
|
||||||
|
color: FlutterFlowTheme.of(
|
||||||
|
context)
|
||||||
|
.primaryText,
|
||||||
|
letterSpacing:
|
||||||
|
0.0,
|
||||||
|
useGoogleFonts: GoogleFonts
|
||||||
|
.asMap()
|
||||||
|
.containsKey(
|
||||||
|
FlutterFlowTheme.of(context)
|
||||||
|
.bodyMediumFamily),
|
||||||
|
),
|
||||||
|
hintStyle:
|
||||||
|
FlutterFlowTheme.of(
|
||||||
|
context)
|
||||||
|
.labelMedium
|
||||||
|
.override(
|
||||||
|
fontFamily: FlutterFlowTheme.of(
|
||||||
|
context)
|
||||||
|
.labelMediumFamily,
|
||||||
|
color: FlutterFlowTheme.of(
|
||||||
|
context)
|
||||||
|
.primaryText,
|
||||||
|
letterSpacing:
|
||||||
|
0.0,
|
||||||
|
useGoogleFonts: GoogleFonts
|
||||||
|
.asMap()
|
||||||
|
.containsKey(
|
||||||
|
FlutterFlowTheme.of(context)
|
||||||
|
.labelMediumFamily),
|
||||||
|
),
|
||||||
|
enabledBorder:
|
||||||
|
OutlineInputBorder(
|
||||||
|
borderSide: BorderSide(
|
||||||
|
color: FlutterFlowTheme
|
||||||
|
.of(context)
|
||||||
|
.customColor5,
|
||||||
|
width: 0.5,
|
||||||
|
),
|
||||||
|
borderRadius:
|
||||||
|
BorderRadius
|
||||||
|
.circular(10.0),
|
||||||
|
),
|
||||||
|
focusedBorder:
|
||||||
|
OutlineInputBorder(
|
||||||
|
borderSide: BorderSide(
|
||||||
|
color: FlutterFlowTheme
|
||||||
|
.of(context)
|
||||||
|
.primary,
|
||||||
|
width: 0.5,
|
||||||
|
),
|
||||||
|
borderRadius:
|
||||||
|
BorderRadius
|
||||||
|
.circular(10.0),
|
||||||
|
),
|
||||||
|
errorBorder:
|
||||||
|
OutlineInputBorder(
|
||||||
|
borderSide: BorderSide(
|
||||||
|
color: FlutterFlowTheme
|
||||||
|
.of(context)
|
||||||
|
.error,
|
||||||
|
width: 0.5,
|
||||||
|
),
|
||||||
|
borderRadius:
|
||||||
|
BorderRadius
|
||||||
|
.circular(10.0),
|
||||||
|
),
|
||||||
|
focusedErrorBorder:
|
||||||
|
OutlineInputBorder(
|
||||||
|
borderSide: BorderSide(
|
||||||
|
color: FlutterFlowTheme
|
||||||
|
.of(context)
|
||||||
|
.error,
|
||||||
|
width: 0.5,
|
||||||
|
),
|
||||||
|
borderRadius:
|
||||||
|
BorderRadius
|
||||||
|
.circular(10.0),
|
||||||
|
),
|
||||||
|
suffixIcon: Icon(
|
||||||
|
Icons.text_fields,
|
||||||
|
color:
|
||||||
|
FlutterFlowTheme.of(
|
||||||
|
context)
|
||||||
|
.accent1,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
labelStyle: FlutterFlowTheme
|
style: FlutterFlowTheme.of(
|
||||||
.of(context)
|
context)
|
||||||
.bodyMedium
|
.bodyMedium
|
||||||
.override(
|
.override(
|
||||||
fontFamily:
|
fontFamily:
|
||||||
|
|
@ -824,185 +920,97 @@ class _ScheduleProvisionalVisitPageWidgetState
|
||||||
context)
|
context)
|
||||||
.bodyMediumFamily),
|
.bodyMediumFamily),
|
||||||
),
|
),
|
||||||
hintStyle: FlutterFlowTheme
|
textAlign: TextAlign.start,
|
||||||
.of(context)
|
maxLines: 3,
|
||||||
.labelMedium
|
maxLength: 100,
|
||||||
.override(
|
maxLengthEnforcement:
|
||||||
fontFamily:
|
MaxLengthEnforcement
|
||||||
FlutterFlowTheme.of(
|
.enforced,
|
||||||
context)
|
validator: _model
|
||||||
.labelMediumFamily,
|
.notesTextControllerValidator
|
||||||
color: FlutterFlowTheme
|
.asValidator(context),
|
||||||
.of(context)
|
|
||||||
.primaryText,
|
|
||||||
letterSpacing: 0.0,
|
|
||||||
useGoogleFonts: GoogleFonts
|
|
||||||
.asMap()
|
|
||||||
.containsKey(
|
|
||||||
FlutterFlowTheme.of(
|
|
||||||
context)
|
|
||||||
.labelMediumFamily),
|
|
||||||
),
|
|
||||||
enabledBorder:
|
|
||||||
OutlineInputBorder(
|
|
||||||
borderSide: BorderSide(
|
|
||||||
color:
|
|
||||||
FlutterFlowTheme.of(
|
|
||||||
context)
|
|
||||||
.customColor5,
|
|
||||||
width: 0.5,
|
|
||||||
),
|
|
||||||
borderRadius:
|
|
||||||
BorderRadius.circular(
|
|
||||||
10.0),
|
|
||||||
),
|
|
||||||
focusedBorder:
|
|
||||||
OutlineInputBorder(
|
|
||||||
borderSide: BorderSide(
|
|
||||||
color:
|
|
||||||
FlutterFlowTheme.of(
|
|
||||||
context)
|
|
||||||
.primary,
|
|
||||||
width: 0.5,
|
|
||||||
),
|
|
||||||
borderRadius:
|
|
||||||
BorderRadius.circular(
|
|
||||||
10.0),
|
|
||||||
),
|
|
||||||
errorBorder:
|
|
||||||
OutlineInputBorder(
|
|
||||||
borderSide: BorderSide(
|
|
||||||
color:
|
|
||||||
FlutterFlowTheme.of(
|
|
||||||
context)
|
|
||||||
.error,
|
|
||||||
width: 0.5,
|
|
||||||
),
|
|
||||||
borderRadius:
|
|
||||||
BorderRadius.circular(
|
|
||||||
10.0),
|
|
||||||
),
|
|
||||||
focusedErrorBorder:
|
|
||||||
OutlineInputBorder(
|
|
||||||
borderSide: BorderSide(
|
|
||||||
color:
|
|
||||||
FlutterFlowTheme.of(
|
|
||||||
context)
|
|
||||||
.error,
|
|
||||||
width: 0.5,
|
|
||||||
),
|
|
||||||
borderRadius:
|
|
||||||
BorderRadius.circular(
|
|
||||||
10.0),
|
|
||||||
),
|
|
||||||
suffixIcon: Icon(
|
|
||||||
Icons.text_fields,
|
|
||||||
color:
|
|
||||||
FlutterFlowTheme.of(
|
|
||||||
context)
|
|
||||||
.accent1,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
style: FlutterFlowTheme.of(
|
|
||||||
context)
|
|
||||||
.bodyMedium
|
|
||||||
.override(
|
|
||||||
fontFamily:
|
|
||||||
FlutterFlowTheme.of(
|
|
||||||
context)
|
|
||||||
.bodyMediumFamily,
|
|
||||||
color:
|
|
||||||
FlutterFlowTheme.of(
|
|
||||||
context)
|
|
||||||
.primaryText,
|
|
||||||
letterSpacing: 0.0,
|
|
||||||
useGoogleFonts: GoogleFonts
|
|
||||||
.asMap()
|
|
||||||
.containsKey(
|
|
||||||
FlutterFlowTheme.of(
|
|
||||||
context)
|
|
||||||
.bodyMediumFamily),
|
|
||||||
),
|
|
||||||
textAlign: TextAlign.start,
|
|
||||||
maxLines: 5,
|
|
||||||
maxLength: 100,
|
|
||||||
maxLengthEnforcement:
|
|
||||||
MaxLengthEnforcement
|
|
||||||
.enforced,
|
|
||||||
validator: _model
|
|
||||||
.notesTextControllerValidator
|
|
||||||
.asValidator(context),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
],
|
||||||
],
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
FFButtonWidget(
|
FFButtonWidget(
|
||||||
onPressed: () async {
|
onPressed: ((_model.personNameTextController.text ==
|
||||||
_model.provVisitSchedule = await PhpGroup
|
'') ||
|
||||||
.postProvVisitSchedulingCall
|
(_model.dateTimeTextController.text ==
|
||||||
.call(
|
''))
|
||||||
devUUID: FFAppState().devUUID,
|
? null
|
||||||
userUUID: FFAppState().userUUID,
|
: () async {
|
||||||
cliID: FFAppState().cliUUID,
|
_model.provVisitSchedule = await PhpGroup
|
||||||
atividade: 'putAgendamentoProv',
|
.postProvVisitSchedulingCall
|
||||||
data: _model.dateTimeTextController.text,
|
.call(
|
||||||
motivo: _model.notesTextController.text,
|
devUUID: FFAppState().devUUID,
|
||||||
nome: _model.personNameTextController.text,
|
userUUID: FFAppState().userUUID,
|
||||||
proID: FFAppState().ownerUUID,
|
cliID: FFAppState().cliUUID,
|
||||||
);
|
atividade: 'putAgendamentoProv',
|
||||||
|
data: _model.dateTimeTextController.text,
|
||||||
if (PhpGroup.postProvVisitSchedulingCall.error(
|
motivo: _model.notesTextController.text,
|
||||||
(_model.provVisitSchedule?.jsonBody ?? ''),
|
nome:
|
||||||
) ==
|
_model.personNameTextController.text,
|
||||||
false) {
|
proID: FFAppState().ownerUUID,
|
||||||
setState(() {
|
|
||||||
_model.dateTimeTextController?.clear();
|
|
||||||
_model.personNameTextController?.clear();
|
|
||||||
_model.notesTextController?.clear();
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
await showModalBottomSheet(
|
|
||||||
isScrollControlled: true,
|
|
||||||
backgroundColor: Colors.transparent,
|
|
||||||
enableDrag: false,
|
|
||||||
context: context,
|
|
||||||
builder: (context) {
|
|
||||||
return GestureDetector(
|
|
||||||
onTap: () =>
|
|
||||||
FocusScope.of(context).unfocus(),
|
|
||||||
child: Padding(
|
|
||||||
padding:
|
|
||||||
MediaQuery.viewInsetsOf(context),
|
|
||||||
child: ThrowExceptionWidget(
|
|
||||||
msg: PhpGroup
|
|
||||||
.postProvVisitSchedulingCall
|
|
||||||
.msg(
|
|
||||||
(_model.provVisitSchedule
|
|
||||||
?.jsonBody ??
|
|
||||||
''),
|
|
||||||
)!,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
},
|
|
||||||
).then((value) => safeSetState(() {}));
|
|
||||||
}
|
|
||||||
|
|
||||||
setState(() {});
|
if (PhpGroup.postProvVisitSchedulingCall
|
||||||
},
|
.error(
|
||||||
|
(_model.provVisitSchedule?.jsonBody ??
|
||||||
|
''),
|
||||||
|
) ==
|
||||||
|
false) {
|
||||||
|
setState(() {
|
||||||
|
_model.dateTimeTextController?.clear();
|
||||||
|
_model.personNameTextController
|
||||||
|
?.clear();
|
||||||
|
_model.notesTextController?.clear();
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
await showModalBottomSheet(
|
||||||
|
isScrollControlled: true,
|
||||||
|
backgroundColor: Colors.transparent,
|
||||||
|
enableDrag: false,
|
||||||
|
context: context,
|
||||||
|
builder: (context) {
|
||||||
|
return GestureDetector(
|
||||||
|
onTap: () => FocusScope.of(context)
|
||||||
|
.unfocus(),
|
||||||
|
child: Padding(
|
||||||
|
padding: MediaQuery.viewInsetsOf(
|
||||||
|
context),
|
||||||
|
child: ThrowExceptionWidget(
|
||||||
|
msg: PhpGroup
|
||||||
|
.postProvVisitSchedulingCall
|
||||||
|
.msg(
|
||||||
|
(_model.provVisitSchedule
|
||||||
|
?.jsonBody ??
|
||||||
|
''),
|
||||||
|
)!,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
).then((value) => safeSetState(() {}));
|
||||||
|
}
|
||||||
|
|
||||||
|
setState(() {});
|
||||||
|
},
|
||||||
text: FFLocalizations.of(context).getText(
|
text: FFLocalizations.of(context).getText(
|
||||||
'bv5fg9sv' /* Enviar */,
|
'bv5fg9sv' /* Enviar */,
|
||||||
),
|
),
|
||||||
options: FFButtonOptions(
|
options: FFButtonOptions(
|
||||||
height: 40.0,
|
width: 150.0,
|
||||||
|
height: 50.0,
|
||||||
padding: const EdgeInsetsDirectional.fromSTEB(
|
padding: const EdgeInsetsDirectional.fromSTEB(
|
||||||
24.0, 0.0, 24.0, 0.0),
|
24.0, 0.0, 24.0, 0.0),
|
||||||
iconPadding: const EdgeInsetsDirectional.fromSTEB(
|
iconPadding: const EdgeInsetsDirectional.fromSTEB(
|
||||||
|
|
@ -1026,6 +1034,9 @@ class _ScheduleProvisionalVisitPageWidgetState
|
||||||
width: 1.0,
|
width: 1.0,
|
||||||
),
|
),
|
||||||
borderRadius: BorderRadius.circular(8.0),
|
borderRadius: BorderRadius.circular(8.0),
|
||||||
|
disabledColor:
|
||||||
|
FlutterFlowTheme.of(context).customColor5,
|
||||||
|
disabledTextColor: Colors.white,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue