Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'development' into textfield-validation

Browse Source
merge-requests/501/head
mosazaid 4 years ago
parent 4b32487540 94b7744dd0
commit 8950dabf7a
8 changed files with 187 additions and 143 deletions
Show Stats Download Patch File Download Diff File

2
lib/core/service/radiology_service.dart
Unescape Escape View File

@ -33,7 +33,7 @@ class RadiologyService extends BaseService {
patient: patient, patient: patient,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
finalRadiologyList.clear(); finalRadiologyList.clear();
response['FinalRadiologyList'].forEach((radiology) { response['ListRAD'].forEach((radiology) {
finalRadiologyList.add(FinalRadiology.fromJson(radiology)); finalRadiologyList.add(FinalRadiology.fromJson(radiology));
}); });
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {

25
lib/screens/medical-file/medical_file_page.dart
Unescape Escape View File

@ -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'),
], )
],
),
) )
], ],
), ),

159
lib/screens/patients/insurance_approval_screen_patient.dart
Unescape Escape View File

@ -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")))
],
),
),
), ),
), ),
); );

4
lib/screens/procedures/entity_list_checkbox_search_widget.dart
Unescape Escape View File

@ -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),

19
lib/screens/procedures/procedure_screen.dart
Unescape Escape View File

@ -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),
)
],
),
),
], ],
), ),
), ),

4
lib/widgets/auth/verification_methods.dart
Unescape Escape View File

@ -15,6 +15,7 @@ import 'package:doctor_app_flutter/widgets/otp/sms-popup.dart';
import 'package:doctor_app_flutter/widgets/shared/app_button.dart'; import 'package:doctor_app_flutter/widgets/shared/app_button.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/rounded_container_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
@ -24,6 +25,7 @@ import 'package:provider/provider.dart';
import '../../config/size_config.dart'; import '../../config/size_config.dart';
import '../../core/viewModel/auth_view_model.dart'; import '../../core/viewModel/auth_view_model.dart';
import '../../landing_page.dart';
import '../../routes.dart'; import '../../routes.dart';
import '../../util/dr_app_shared_pref.dart'; import '../../util/dr_app_shared_pref.dart';
import '../../util/helpers.dart'; import '../../util/helpers.dart';
@ -858,7 +860,7 @@ class _VerificationMethodsState extends State<VerificationMethods> {
sharedPref.setObj(DOCTOR_PROFILE, profile); sharedPref.setObj(DOCTOR_PROFILE, profile);
projectsProvider.isLogin = true; projectsProvider.isLogin = true;
Navigator.of(context).popAndPushNamed(HOME); Navigator.pushAndRemoveUntil(context, FadePage(page: LandingPage(),), (r) => false);
} }
getDocProfiles(ClinicModel clinicInfo, authProv) { getDocProfiles(ClinicModel clinicInfo, authProv) {

84
lib/widgets/shared/doctor_card.dart
Unescape Escape View File

@ -29,7 +29,9 @@ class DoctorCard extends StatelessWidget {
this.invoiceNO, this.invoiceNO,
this.onTap, this.onTap,
this.appointmentDate, this.appointmentDate,
this.orderNo, this.isPrescriptions=false, this.clinic}); this.orderNo,
this.isPrescriptions = false,
this.clinic});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -69,13 +71,13 @@ class DoctorCard extends StatelessWidget {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 14, fontSize: 14,
), ),
if(!isPrescriptions) if (!isPrescriptions)
Texts( Texts(
'${DateUtils.getHour(appointmentDate)}', '${DateUtils.getHour(appointmentDate)}',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Colors.grey[700], color: Colors.grey[700],
fontSize: 14, fontSize: 14,
), ),
], ],
), ),
), ),
@ -106,7 +108,8 @@ class DoctorCard extends StatelessWidget {
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( Texts(
'order No:', TranslationBase.of(context).orderNo +
": ",
color: Colors.grey[500], color: Colors.grey[500],
fontSize: 14, fontSize: 14,
), ),
@ -120,7 +123,9 @@ class DoctorCard extends StatelessWidget {
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( Texts(
'Invoice:', TranslationBase.of(context)
.invoiceNo +
": ",
fontSize: 14, fontSize: 14,
color: Colors.grey[500], color: Colors.grey[500],
), ),
@ -130,34 +135,36 @@ class DoctorCard extends StatelessWidget {
) )
], ],
), ),
if(clinic!=null) if (clinic != null)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( Texts(
'Clinic: ', TranslationBase.of(context).clinic +
color: Colors.grey[500], ": ",
fontSize: 14, color: Colors.grey[500],
), fontSize: 14,
Texts( ),
clinic, Texts(
fontSize: 14, clinic,
) fontSize: 14,
], )
), ],
if(branch!=null) ),
Row( if (branch != null)
children: <Widget>[ Row(
Texts( children: <Widget>[
'Branch: ', Texts(
fontSize: 14, TranslationBase.of(context).branch +
color: Colors.grey[500], ": ",
), fontSize: 14,
Texts( color: Colors.grey[500],
branch, ),
fontSize: 14, Texts(
) branch,
], fontSize: 14,
) )
],
)
]), ]),
), ),
), ),
@ -167,7 +174,6 @@ class DoctorCard extends StatelessWidget {
], ],
), ),
), ),
], ],
), ),
], ],

33
lib/widgets/shared/doctor_card_insurance.dart
Unescape Escape View File

@ -1,5 +1,6 @@
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -105,7 +106,7 @@ class DoctorCardInsurance extends StatelessWidget {
Expanded( Expanded(
child: Texts( child: Texts(
doctorName, doctorName,
fontWeight: FontWeight.w700, bold: true,
)), )),
], ],
), ),
@ -155,15 +156,18 @@ class DoctorCardInsurance extends StatelessWidget {
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( Texts(
'Clinic: ', TranslationBase.of(context).clinic +
": ",
color: Colors.grey[500],
fontSize: 14,
//fontWeight: FontWeight.w600, //fontWeight: FontWeight.w600,
//color: Colors.grey[500], //color: Colors.grey[500],
), ),
Expanded( Expanded(
child: Texts( child: Texts(
clinic, clinic,
fontWeight: FontWeight.w700, //fontWeight: FontWeight.w700,
fontSize: 15.0, fontSize: 14.0,
), ),
) )
], ],
@ -172,26 +176,30 @@ class DoctorCardInsurance extends StatelessWidget {
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( Texts(
'Branch:', TranslationBase.of(context).branch +
//color: Colors.grey[500], ": ",
fontSize: 14,
color: Colors.grey[500],
), ),
Texts( Texts(
branch2, branch2,
fontWeight: FontWeight.w700, fontSize: 14.0,
fontSize: 15.0,
) )
], ],
), ),
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( Texts(
'Approval No: ', TranslationBase.of(context)
.approvalNo +
": ",
fontSize: 14,
color: Colors.grey[500],
//color: Colors.grey[500], //color: Colors.grey[500],
), ),
Texts( Texts(
branch, branch,
fontWeight: FontWeight.w700, fontSize: 14.0,
fontSize: 15.0,
) )
], ],
), ),
@ -202,8 +210,7 @@ class DoctorCardInsurance extends StatelessWidget {
padding: padding:
const EdgeInsets.symmetric(horizontal: 15.0), const EdgeInsets.symmetric(horizontal: 15.0),
child: Icon( child: Icon(
DoctorApp.view, EvaIcons.eye,
size: 22.0,
), ),
) )
], ],

Write Preview
Loading…
Cancel
Save