8 step from fix screen

merge-requests/898/head
Elham Rababh 4 years ago
parent bd64603e82
commit 26f5e57417

@ -74,7 +74,7 @@ class _DischargedPatientState extends State<DischargedPatient> {
DoctorApp.filter_1, DoctorApp.filter_1,
color: Colors.black, color: Colors.black,
), ),
iconSize: 20, onPressed: () { }, iconSize: 20,
), ),
), ),
SizedBox( SizedBox(

@ -24,7 +24,7 @@ class UcafDetailScreen extends StatefulWidget {
final UcafViewModel model; final UcafViewModel model;
final Function changeLoadingState; final Function changeLoadingState;
UcafDetailScreen(this.patient, this.model, {this.changeLoadingState}); UcafDetailScreen(this.patient, this.model, {required this.changeLoadingState});
@override @override
_UcafDetailScreenState createState() => _UcafDetailScreenState(this.patient, this.model); _UcafDetailScreenState createState() => _UcafDetailScreenState(this.patient, this.model);
@ -32,10 +32,10 @@ class UcafDetailScreen extends StatefulWidget {
class _UcafDetailScreenState extends State<UcafDetailScreen> { class _UcafDetailScreenState extends State<UcafDetailScreen> {
final PatiantInformtion patient; PatiantInformtion patient;
final UcafViewModel model; UcafViewModel model;
UcafViewModel ucafModel; late UcafViewModel ucafModel;
int _activeTap = 0; int _activeTap = 0;

@ -21,7 +21,7 @@ class UCAFInputScreen extends StatefulWidget {
final PatiantInformtion patient; final PatiantInformtion patient;
final Function changeLoadingState; final Function changeLoadingState;
UCAFInputScreen(this.patient, {this.changeLoadingState}); UCAFInputScreen(this.patient, {required this.changeLoadingState});
@override @override
_UCAFInputScreenState createState() => _UCAFInputScreenState(this.patient); _UCAFInputScreenState createState() => _UCAFInputScreenState(this.patient);

@ -16,7 +16,7 @@ class PageStepperWidget extends StatelessWidget {
final int stepsCount; final int stepsCount;
final int currentStepIndex; final int currentStepIndex;
final Size screenSize; final Size screenSize;
final List<String> stepsTitles; final List<String>? stepsTitles;
PageStepperWidget({required this.stepsCount, required this.currentStepIndex, required this.screenSize, this.stepsTitles}); PageStepperWidget({required this.stepsCount, required this.currentStepIndex, required this.screenSize, this.stepsTitles});
@ -33,9 +33,9 @@ class PageStepperWidget extends StatelessWidget {
children: [ children: [
for (int i = 1; i <= stepsCount; i++) for (int i = 1; i <= stepsCount; i++)
if (i == currentStepIndex) if (i == currentStepIndex)
StepWidget(i, true, i == stepsCount, i < currentStepIndex, dividerWidth, stepsTitles: stepsTitles,) StepWidget(i, true, i == stepsCount, i < currentStepIndex, dividerWidth, stepsTitles: stepsTitles!,)
else else
StepWidget(i, false, i == stepsCount, i < currentStepIndex, dividerWidth, stepsTitles: stepsTitles,) StepWidget(i, false, i == stepsCount, i < currentStepIndex, dividerWidth, stepsTitles: stepsTitles!,)
], ],
) )
], ],
@ -52,7 +52,7 @@ class StepWidget extends StatelessWidget {
final double dividerWidth; final double dividerWidth;
final List<String> stepsTitles; final List<String> stepsTitles;
StepWidget(this.index, this.isInProgress, this.isFinalStep, this.isStepFinish, this.dividerWidth, {this.stepsTitles}); StepWidget(this.index, this.isInProgress, this.isFinalStep, this.isStepFinish, this.dividerWidth, {required this.stepsTitles});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

@ -23,13 +23,13 @@ class UCAFPagerScreen extends StatefulWidget {
class _UCAFPagerScreenState extends State<UCAFPagerScreen> class _UCAFPagerScreenState extends State<UCAFPagerScreen>
with TickerProviderStateMixin { with TickerProviderStateMixin {
PageController _controller; late PageController _controller;
int _currentIndex = 0; int _currentIndex = 0;
bool _isLoading = true; bool _isLoading = true;
PatiantInformtion patient; late PatiantInformtion patient;
String patientType; late String patientType;
String arrivalType; late String arrivalType;
changePageViewIndex(pageIndex, {isChangeState = true}) { changePageViewIndex(pageIndex, {isChangeState = true}) {
if (pageIndex != _currentIndex && isChangeState) changeLoadingState(true); if (pageIndex != _currentIndex && isChangeState) changeLoadingState(true);
@ -65,7 +65,7 @@ class _UCAFPagerScreenState extends State<UCAFPagerScreen>
isShowAppBar: true, isShowAppBar: true,
isLoading: _isLoading, isLoading: _isLoading,
appBar: PatientProfileAppBar(patient), appBar: PatientProfileAppBar(patient),
appBarTitle: TranslationBase.of(context).ucaf, appBarTitle: TranslationBase.of(context).ucaf!,
body: Column( body: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [

@ -475,7 +475,7 @@ class VitalSignDetailsScreen extends StatelessWidget {
: Container( : Container(
color: Theme.of(context).scaffoldBackgroundColor, color: Theme.of(context).scaffoldBackgroundColor,
child: ErrorMessage( child: ErrorMessage(
error: TranslationBase.of(context).vitalSignEmptyMsg, error: TranslationBase.of(context).vitalSignEmptyMsg!,
)), )),
), ),
); );

@ -6,16 +6,16 @@ import 'package:flutter/material.dart';
class CustomEditableText extends StatefulWidget { class CustomEditableText extends StatefulWidget {
CustomEditableText({ CustomEditableText({
Key key, Key? key,
required this.controller, required this.controller,
this.hint, this.hint,
this.isEditable = false, this.isEditable = false,
this.isSubmitted, required this.isSubmitted,
}) : super(key: key); }) : super(key: key);
final TextEditingController controller; final TextEditingController controller;
final String hint; final String? hint;
bool isEditable; bool isEditable;
final bool isSubmitted; final bool isSubmitted;

@ -39,12 +39,12 @@ import 'package:speech_to_text/speech_to_text.dart' as stt;
import 'CustomEditableText.dart'; import 'CustomEditableText.dart';
class RegisterConfirmationPatientPage extends StatefulWidget { class RegisterConfirmationPatientPage extends StatefulWidget {
final OperationReportViewModel operationReportViewModel; final OperationReportViewModel? operationReportViewModel;
final PatiantInformtion patient; final PatiantInformtion? patient;
final PatientRegistrationViewModel model; final PatientRegistrationViewModel model;
const RegisterConfirmationPatientPage( const RegisterConfirmationPatientPage(
{Key? key, this.operationReportViewModel, this.patient, this.model}) {Key? key, this.operationReportViewModel, this.patient, required this.model})
: super(key: key); : super(key: key);
@override @override
@ -55,15 +55,15 @@ class RegisterConfirmationPatientPage extends StatefulWidget {
class _RegisterConfirmationPatientPageState class _RegisterConfirmationPatientPageState
extends State<RegisterConfirmationPatientPage> { extends State<RegisterConfirmationPatientPage> {
bool isSubmitted = false; bool isSubmitted = false;
ProjectViewModel projectViewModel; late ProjectViewModel projectViewModel;
TextEditingController firstNameN; late TextEditingController firstNameN;
TextEditingController middleNameN; late TextEditingController middleNameN;
TextEditingController lastNameN; late TextEditingController lastNameN;
TextEditingController firstNameAr; late TextEditingController firstNameAr;
TextEditingController middleNameAr; late TextEditingController middleNameAr;
TextEditingController lastNameAr; late TextEditingController lastNameAr;
TextEditingController emailAddressController; late TextEditingController emailAddressController;
TextEditingController langController = TextEditingController(text: "English"); late TextEditingController langController = TextEditingController(text: "English");
int selectedLang = 1; int selectedLang = 1;
@override @override
@ -393,7 +393,7 @@ class _RegisterConfirmationPatientPageState
widget.model.getPatientInfoResponseModel.dateOfBirth); widget.model.getPatientInfoResponseModel.dateOfBirth);
var dateFormat = DateFormat('MM/dd/yyyy').parse( var dateFormat = DateFormat('MM/dd/yyyy').parse(
widget.model.getPatientInfoResponseModel.dateOfBirth); widget.model.getPatientInfoResponseModel.dateOfBirth!);
String wellFormat = String wellFormat =
"${dateFormat.day}\/${dateFormat.month}\/${dateFormat.year}"; "${dateFormat.day}\/${dateFormat.month}\/${dateFormat.year}";
print( print(
@ -425,7 +425,7 @@ class _RegisterConfirmationPatientPageState
strDateofBirth: dateFormat.toUtc().toString(), strDateofBirth: dateFormat.toUtc().toString(),
dateofBirth: AppDateUtils.convertToServerFormat( dateofBirth: AppDateUtils.convertToServerFormat(
widget.model.getPatientInfoResponseModel widget.model.getPatientInfoResponseModel
.dateOfBirth, .dateOfBirth!,
'MM/dd/yyyy'), 'MM/dd/yyyy'),
dateofBirthN: '$hijriDate', dateofBirthN: '$hijriDate',
gender: (widget.model.getPatientInfoResponseModel.gender == "M") gender: (widget.model.getPatientInfoResponseModel.gender == "M")

@ -20,7 +20,7 @@ class RegisterPatientPage extends StatefulWidget {
class _RegisterPatientPageState extends State<RegisterPatientPage> class _RegisterPatientPageState extends State<RegisterPatientPage>
with TickerProviderStateMixin { with TickerProviderStateMixin {
PageController _controller; late PageController _controller;
int _currentIndex = 0; int _currentIndex = 0;
bool _isLoading = false; bool _isLoading = false;
@ -61,7 +61,7 @@ class _RegisterPatientPageState extends State<RegisterPatientPage>
isShowAppBar: true, isShowAppBar: true,
isLoading: _isLoading, isLoading: _isLoading,
appBar: PatientSearchHeader( appBar: PatientSearchHeader(
title: TranslationBase.of(context).registeraPatient, title: TranslationBase.of(context).registeraPatient!,
), ),
body: Column( body: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

@ -30,7 +30,7 @@ class RegisterSearchPatientPage extends StatefulWidget {
final PatientRegistrationViewModel model; final PatientRegistrationViewModel model;
const RegisterSearchPatientPage( const RegisterSearchPatientPage(
{Key? key, this.changePageViewIndex, this.model}) {Key? key, required this.changePageViewIndex, required this.model})
: super(key: key); : super(key: key);
@override @override
@ -39,7 +39,7 @@ class RegisterSearchPatientPage extends StatefulWidget {
} }
class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> { class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
late String countryError; var countryError;
dynamic _selectedCountry; dynamic _selectedCountry;
late List<dynamic> countryList; late List<dynamic> countryList;
@ -191,9 +191,9 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
title: AppText("Gregorian"), title: AppText("Gregorian"),
value: CalenderType.Gregorian, value: CalenderType.Gregorian,
groupValue: calenderType, groupValue: calenderType,
onChanged: (CalenderType value) { onChanged: (CalenderType? value) {
setState(() { setState(() {
calenderType = value; calenderType = value!;
}); });
}, },
), ),
@ -203,9 +203,9 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
title: AppText("Hijri"), title: AppText("Hijri"),
value: CalenderType.Hijri, value: CalenderType.Hijri,
groupValue: calenderType, groupValue: calenderType,
onChanged: (CalenderType value) { onChanged: (CalenderType ? value) {
setState(() { setState(() {
calenderType = value; calenderType = value!;
}); });
}, },
), ),
@ -307,7 +307,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
isSubmitted = true; isSubmitted = true;
}); });
if (country == null) { if (country == null) {
countryError = TranslationBase.of(context).fieldRequired; countryError = TranslationBase.of(context).fieldRequired!;
} else { } else {
countryError = null; countryError = null;
} }
@ -397,7 +397,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
); );
if (pickedH != null && birthDateInHijri != pickedH) updateDate(pickedH); if (pickedH != null && birthDateInHijri != pickedH) updateDate(pickedH);
} else { } else {
final DateTime picked = await showDatePicker( final DateTime? picked = await showDatePicker(
context: context, context: context,
initialDate: dateTime ?? DateTime.now(), initialDate: dateTime ?? DateTime.now(),
firstDate: DateTime(DateTime.now().year - 150), firstDate: DateTime(DateTime.now().year - 150),

Loading…
Cancel
Save