fixed the errorMessage inside many pages

merge-requests/943/head
RoaaGhali98 3 years ago
parent 0901a2e39c
commit 17eeaf2cc6

@ -13,6 +13,8 @@ import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../widgets/shared/errors/error_message.dart';
class HealthSummaryPage extends StatefulWidget { class HealthSummaryPage extends StatefulWidget {
@override @override
_HealthSummaryPageState createState() => _HealthSummaryPageState(); _HealthSummaryPageState createState() => _HealthSummaryPageState();
@ -141,19 +143,7 @@ class _HealthSummaryPageState extends State<HealthSummaryPage> {
); );
}) })
: Center( : Center(
child: Column( child: ErrorMessage(error: TranslationBase.of(context).noMedicalFileFound,)
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(TranslationBase.of(context).noMedicalFileFound),
)
],
),
) )
], ],
), ),

@ -13,6 +13,8 @@ import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../widgets/shared/errors/error_message.dart';
class MedicalFileDetails extends StatefulWidget { class MedicalFileDetails extends StatefulWidget {
String age; String age;
String firstName; String firstName;
@ -928,22 +930,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
), ),
) )
: Center( : Center(
child: Column( child: ErrorMessage(error: TranslationBase.of(context).noDataAvailable,)
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText('No Data For This Visit '),
),
SizedBox(
height: 100,
),
],
),
) )
], ],
), ),

@ -13,6 +13,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../routes.dart'; import '../../routes.dart';
import '../../widgets/shared/errors/error_message.dart';
class DischargedPatient extends StatefulWidget { class DischargedPatient extends StatefulWidget {
@override @override
@ -34,25 +35,10 @@ class _DischargedPatientState extends State<DischargedPatient> {
baseViewModel: model, baseViewModel: model,
body: model.myDischargedPatient.isEmpty body: model.myDischargedPatient.isEmpty
? Center( ? Center(
child: Column( child: Container(
crossAxisAlignment: CrossAxisAlignment.center, child: ErrorMessage(error: TranslationBase.of(context).referralEmptyMsg,
children: [ ),
Container( )
height: MediaQuery.of(context).size.height * 0.070,
),
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(
'No Discharged Patient',
color: Theme.of(context).errorColor,
),
)
],
),
) )
: Padding( : Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),

@ -9,6 +9,8 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import '../../util/translations_delegate_base.dart';
import '../../widgets/shared/errors/error_message.dart';
import 'ReferralDischargedPatientDetails.dart'; import 'ReferralDischargedPatientDetails.dart';
class ReferralDischargedPatientPage extends StatefulWidget { class ReferralDischargedPatientPage extends StatefulWidget {
@ -28,22 +30,10 @@ class _ReferralDischargedPatientPageState extends State<ReferralDischargedPatien
isShowAppBar: false, isShowAppBar: false,
baseViewModel: model, baseViewModel: model,
body: model.myDischargeReferralPatient.isEmpty?Center( body: model.myDischargeReferralPatient.isEmpty?Center(
child: Column( child: Container(
crossAxisAlignment: CrossAxisAlignment.center, child: ErrorMessage(error: TranslationBase.of(context).referralEmptyMsg,
children: [
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(
'No Discharged Patient',
color: Theme.of(context).errorColor,
),
)
],
), ),
)
):Padding( ):Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Column( child: Column(

@ -15,6 +15,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../widgets/shared/errors/error_message.dart';
import '../base/base_view.dart'; import '../base/base_view.dart';
class InsuranceApprovalScreenNew extends StatefulWidget { class InsuranceApprovalScreenNew extends StatefulWidget {
@ -119,23 +120,7 @@ class _InsuranceApprovalScreenNewState
], ],
) )
: Center( : Center(
child: Column( child: ErrorMessage(error: TranslationBase.of(context).referralEmptyMsg,)
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(TranslationBase.of(context)
.noInsuranceApprovalFound),
),
SizedBox(
height: 150.0,
)
],
),
), ),
), ),
) )
@ -207,20 +192,7 @@ class _InsuranceApprovalScreenNewState
], ],
) )
: Center( : Center(
child: Column( child: ErrorMessage(error: TranslationBase.of(context).noInsuranceApprovalFound,)
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(TranslationBase.of(context)
.noInsuranceApprovalFound),
)
],
),
)), )),
), ),
), ),

@ -17,6 +17,7 @@ import 'package:flutter/services.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import '../../../../routes.dart'; import '../../../../routes.dart';
import '../../../../widgets/shared/errors/error_message.dart';
class UCAFInputScreen extends StatefulWidget { class UCAFInputScreen extends StatefulWidget {
final PatiantInformtion patient; final PatiantInformtion patient;
@ -384,28 +385,10 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
: model.patientChiefComplaintList != null || : model.patientChiefComplaintList != null ||
model.patientVitalSignsHistory != null model.patientVitalSignsHistory != null
? Center( ? Center(
child: Column( child: ErrorMessage(error: model.patientVitalSignsHistory == null || model.patientVitalSignsHistory.length == 0
crossAxisAlignment: CrossAxisAlignment.center, ? TranslationBase.of(context).vitalSignEmptyMsg
children: [ : TranslationBase.of(context)
SizedBox( )
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(
model.patientVitalSignsHistory == null || model.patientVitalSignsHistory.length == 0
? TranslationBase.of(context).vitalSignEmptyMsg
: TranslationBase.of(context)
.chiefComplaintEmptyMsg,
fontWeight: FontWeight.normal,
textAlign: TextAlign.center,
color: HexColor("#B8382B"),
fontSize: SizeConfig.textMultiplier * 2.5,
),
)
],
),
) )
: Container(), : Container(),
), ),

@ -10,6 +10,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import '../../../../widgets/shared/errors/error_message.dart';
import 'lab_result_history_chart_and_detials.dart'; import 'lab_result_history_chart_and_detials.dart';
import 'lab_result_chart_and_detials.dart'; import 'lab_result_chart_and_detials.dart';
@ -52,22 +53,7 @@ class FlowChartPage extends StatelessWidget {
) )
: Container( : Container(
child: Center( child: Center(
child: Column( child: ErrorMessage(error: TranslationBase.of(context).noDataAvailable,)
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
children: [
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(
TranslationBase.of(context).noDataAvailable,
fontWeight: FontWeight.normal,
color: HexColor("#B8382B"),
fontSize: SizeConfig.textMultiplier * 2.5,
),
)
],
),
), ),
), ),
), ),

@ -13,6 +13,8 @@ import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../../../widgets/shared/errors/error_message.dart';
class AllLabSpecialResult extends StatefulWidget { class AllLabSpecialResult extends StatefulWidget {
const AllLabSpecialResult({Key key}) : super(key: key); const AllLabSpecialResult({Key key}) : super(key: key);
@ -189,19 +191,7 @@ class _AllLabSpecialResultState extends State<AllLabSpecialResult> {
if (model.allSpecialLabList.isEmpty && if (model.allSpecialLabList.isEmpty &&
patient.patientStatusType != 43) patient.patientStatusType != 43)
Center( Center(
child: Column( child: ErrorMessage(error: TranslationBase.of(context).noDataAvailable,)
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText('No Lab Result Found'),
)
],
),
) )
], ],
), ),

@ -18,6 +18,8 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../../../widgets/shared/errors/error_message.dart';
class LabsHomePage extends StatefulWidget { class LabsHomePage extends StatefulWidget {
@override @override
_LabsHomePageState createState() => _LabsHomePageState(); _LabsHomePageState createState() => _LabsHomePageState();
@ -220,19 +222,7 @@ class _LabsHomePageState extends State<LabsHomePage> {
if (model.patientLabOrdersList.isEmpty && if (model.patientLabOrdersList.isEmpty &&
patient.patientStatusType != 43) patient.patientStatusType != 43)
Center( Center(
child: Column( child: ErrorMessage(error: TranslationBase.of(context).noDataAvailable,)
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText('No Lab Result Found'),
)
],
),
) )
], ],
), ),

@ -17,6 +17,8 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../../../widgets/shared/errors/error_message.dart';
class RadiologyHomePage extends StatefulWidget { class RadiologyHomePage extends StatefulWidget {
@override @override
_RadiologyHomePageState createState() => _RadiologyHomePageState(); _RadiologyHomePageState createState() => _RadiologyHomePageState();
@ -192,19 +194,7 @@ class _RadiologyHomePageState extends State<RadiologyHomePage> {
)), )),
if (model.radiologyList.isEmpty && patient.patientStatusType != 43) if (model.radiologyList.isEmpty && patient.patientStatusType != 43)
Center( Center(
child: Column( child: ErrorMessage(error: TranslationBase.of(context).noDataAvailable,)
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText('No Radiology Found'),
)
],
),
) )
], ],
), ),

@ -14,6 +14,7 @@ import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import '../../../../widgets/shared/errors/error_message.dart';
import 'my-referral-patient-screen.dart'; import 'my-referral-patient-screen.dart';
class MyReferralInPatientScreen extends StatefulWidget { class MyReferralInPatientScreen extends StatefulWidget {
@ -56,22 +57,7 @@ class _MyReferralInPatientScreenState extends State<MyReferralInPatientScreen> {
), ),
model.myReferralPatients.isEmpty model.myReferralPatients.isEmpty
? Center( ? Center(
child: Column( child: ErrorMessage(error: TranslationBase.of(context).referralEmptyMsg,)
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(
TranslationBase.of(context).referralEmptyMsg,
color: Theme.of(context).errorColor,
),
)
],
),
) )
: Expanded( : Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(

@ -8,6 +8,7 @@ import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import '../../../../routes.dart'; import '../../../../routes.dart';
import '../../../../widgets/shared/errors/error_message.dart';
class MyReferralPatientScreen extends StatelessWidget { class MyReferralPatientScreen extends StatelessWidget {
@override @override
@ -20,22 +21,9 @@ class MyReferralPatientScreen extends StatelessWidget {
appBarTitle: TranslationBase.of(context).referPatient, appBarTitle: TranslationBase.of(context).referPatient,
body: model.pendingReferral == null || model.pendingReferral.length == 0 body: model.pendingReferral == null || model.pendingReferral.length == 0
? Center( ? Center(
child: Column( child: Container(
crossAxisAlignment: CrossAxisAlignment.center, child: ErrorMessage(error: TranslationBase.of(context).referralEmptyMsg,
children: [ ))
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(
TranslationBase.of(context).referralEmptyMsg,
color: Theme.of(context).errorColor,
),
)
],
),
) )
: SingleChildScrollView( : SingleChildScrollView(
child: Container( child: Container(

@ -12,6 +12,8 @@ import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import '../../../../widgets/shared/errors/error_message.dart';
class ReferredPatientScreen extends StatefulWidget { class ReferredPatientScreen extends StatefulWidget {
@override @override
_ReferredPatientScreenState createState() => _ReferredPatientScreenState(); _ReferredPatientScreenState createState() => _ReferredPatientScreenState();
@ -50,22 +52,7 @@ class _ReferredPatientScreenState extends State<ReferredPatientScreen> {
model.listMyReferredPatientModel == null || model.listMyReferredPatientModel == null ||
model.listMyReferredPatientModel.length == 0 model.listMyReferredPatientModel.length == 0
? Center( ? Center(
child: Column( child: ErrorMessage(error: TranslationBase.of(context).referralEmptyMsg,)
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(
TranslationBase.of(context).referralEmptyMsg,
color: Theme.of(context).errorColor,
),
)
],
),
) )
: Expanded( : Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(

@ -20,6 +20,8 @@ import 'package:doctor_app_flutter/widgets/transitions/slide_up_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../widgets/shared/errors/error_message.dart';
class PrescriptionsPage extends StatelessWidget { class PrescriptionsPage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -133,20 +135,7 @@ class PrescriptionsPage extends StatelessWidget {
if (model.prescriptionsList.isEmpty && if (model.prescriptionsList.isEmpty &&
patient.patientStatusType != 43) patient.patientStatusType != 43)
Center( Center(
child: Column( child: ErrorMessage(error: TranslationBase.of(context).noPrescriptionsFound,)
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(TranslationBase.of(context)
.noPrescriptionsFound),
)
],
),
) )
], ],
), ),
@ -216,20 +205,7 @@ class PrescriptionsPage extends StatelessWidget {
}), }),
if (model.medicationForInPatient.length == 0) if (model.medicationForInPatient.length == 0)
Center( Center(
child: Column( child: ErrorMessage(error: TranslationBase.of(context).noPrescriptionsFound,)
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(TranslationBase.of(context)
.noPrescriptionsFound),
)
],
),
) )
], ],
), ),

@ -14,6 +14,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/transitions/slide_up_page.dart'; import 'package:doctor_app_flutter/widgets/transitions/slide_up_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../widgets/shared/errors/error_message.dart';
import 'ProcedureCard.dart'; import 'ProcedureCard.dart';
import 'ProcedureType.dart'; import 'ProcedureType.dart';
import 'base_add_procedure_tab_page.dart'; import 'base_add_procedure_tab_page.dart';
@ -180,19 +181,7 @@ class ProcedureScreen extends StatelessWidget {
if (model.state == ViewState.ErrorLocal || if (model.state == ViewState.ErrorLocal ||
(model.procedureList.isNotEmpty && model.procedureList[0].entityList.isEmpty)) (model.procedureList.isNotEmpty && model.procedureList[0].entityList.isEmpty))
Center( Center(
child: Column( child: ErrorMessage(error: TranslationBase.of(context).noDataAvailable,)
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(22.0),
child: AppText(model.procedureList.isEmpty ? model.error : 'No Procedure Found '),
)
],
),
), ),
], ],
), ),

Loading…
Cancel
Save