Hot Fixes

merge-requests/497/head
hussam al-habibeh 5 years ago
parent ff2f456b46
commit 99ef89fa16

@ -13,6 +13,7 @@ import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart'; import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart';
@ -160,19 +161,21 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
isPrescriptions: true, isPrescriptions: true,
), ),
); );
}) })
: Column( : Center(
children: [ child: Column(
Container( crossAxisAlignment: CrossAxisAlignment.center,
child: AppText( children: [
'THERES NO MEDICAL FILE FOR THIS Patient', SizedBox(
height: 100,
), ),
), Image.asset('assets/images/no-data.png'),
SizedBox( Padding(
height: 400, padding: const EdgeInsets.all(8.0),
) child: Texts('No Medical File Found'),
], )
],
),
) )
], ],
), ),

@ -54,87 +54,94 @@ class _InsuranceApprovalScreenNewState
appBarTitle: TranslationBase.of(context).approvals, appBarTitle: TranslationBase.of(context).approvals,
body: SingleChildScrollView( body: SingleChildScrollView(
child: Container( child: Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: SizeConfig.screenWidth * 0.004, left: SizeConfig.screenWidth * 0.004,
right: SizeConfig.screenWidth * 0.004, right: SizeConfig.screenWidth * 0.004,
top: SizeConfig.screenWidth * 0.04, top: SizeConfig.screenWidth * 0.04,
), ),
child: model.insuranceApproval.length != 0 child: model.insuranceApproval.length != 0
? Column( ? Column(
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Column( child: Column(
children: [ children: [
Row( Row(
children: [ children: [
AppText( AppText(
'Insurance', 'Insurance',
fontSize: 15.0, fontSize: 15.0,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontFamily: 'Poppins', fontFamily: 'Poppins',
), ),
], ],
), ),
Row( Row(
children: [ children: [
AppText( AppText(
'Approvals', 'Approvals',
fontSize: 30.0, fontSize: 30.0,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
], ],
), ),
], ],
),
), ),
), ...List.generate(
...List.generate( model.insuranceApproval.length,
model.insuranceApproval.length, (index) => Container(
(index) => Container( child: InkWell(
child: InkWell( onTap: () {
onTap: () { Navigator.push(
Navigator.push( context,
context, MaterialPageRoute(
MaterialPageRoute( builder: (context) =>
builder: (context) => InsuranceApprovalsDetails(
InsuranceApprovalsDetails( patient: patient,
patient: patient, indexInsurance: index,
indexInsurance: index, )),
)), );
); },
}, child: DoctorCardInsurance(
child: DoctorCardInsurance( patientOut: model.insuranceApproval[index]
patientOut: model .patientDescription,
.insuranceApproval[index].patientDescription, profileUrl:
profileUrl: model.insuranceApproval[index].doctorImage,
model.insuranceApproval[index].doctorImage, clinic:
clinic: model.insuranceApproval[index].clinicName, model.insuranceApproval[index].clinicName,
doctorName: doctorName:
model.insuranceApproval[index].doctorName, model.insuranceApproval[index].doctorName,
branch: model.insuranceApproval[index].approvalNo branch: model
.toString(), .insuranceApproval[index].approvalNo
isPrescriptions: true, .toString(),
approvalStatus: model.insuranceApproval[index] isPrescriptions: true,
.approvalStatusDescption ?? approvalStatus: model.insuranceApproval[index]
'', .approvalStatusDescption ??
branch2: '',
model.insuranceApproval[index].projectName, branch2:
model.insuranceApproval[index].projectName,
),
), ),
), ),
), ),
],
)
: Center(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: Texts('No Insurance Approval Found'),
)
],
), ),
], )),
)
: Column(
children: [
Container(
height: 200,
width: double.infinity,
child: Center(
child: Text("No Insurance Approvals Found")))
],
),
),
), ),
), ),
); );

@ -1,3 +1,5 @@
import 'dart:ffi';
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/procedure/categories_procedure.dart'; import 'package:doctor_app_flutter/core/model/procedure/categories_procedure.dart';
import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart'; import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart';
@ -69,7 +71,7 @@ class _EntityListCheckboxSearchWidgetState
NetworkBaseView( NetworkBaseView(
baseViewModel: widget.model, baseViewModel: widget.model,
child: Container( child: Container(
height: MediaQuery.of(context).size.height * 0.65, height: MediaQuery.of(context).size.height * 0.75,
child: Center( child: Center(
child: Container( child: Container(
margin: EdgeInsets.only(top: 15), margin: EdgeInsets.only(top: 15),

@ -1,4 +1,5 @@
import 'package:doctor_app_flutter/client/base_app_client.dart'; import 'package:doctor_app_flutter/client/base_app_client.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart'; import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
@ -190,7 +191,23 @@ class ProcedureScreen extends StatelessWidget {
) )
], ],
), ),
) ),
if (model.state == ViewState.ErrorLocal)
Center(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(22.0),
child: Texts(model.error),
)
],
),
),
], ],
), ),
), ),

Loading…
Cancel
Save