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,
onSuccess: (dynamic response, int statusCode) {
finalRadiologyList.clear();
response['FinalRadiologyList'].forEach((radiology) {
response['ListRAD'].forEach((radiology) {
finalRadiologyList.add(FinalRadiology.fromJson(radiology));
});
}, 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.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_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart';
@ -160,19 +161,21 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
isPrescriptions: true,
),
);
})
: Column(
children: [
Container(
child: AppText(
'THERES NO MEDICAL FILE FOR THIS Patient',
: Center(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
),
SizedBox(
height: 400,
)
],
Image.asset('assets/images/no-data.png'),
Padding(
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,
body: SingleChildScrollView(
child: Container(
margin: EdgeInsets.only(
left: SizeConfig.screenWidth * 0.004,
right: SizeConfig.screenWidth * 0.004,
top: SizeConfig.screenWidth * 0.04,
),
child: model.insuranceApproval.length != 0
? Column(
children: <Widget>[
Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
Row(
children: [
AppText(
'Insurance',
fontSize: 15.0,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
),
],
),
Row(
children: [
AppText(
'Approvals',
fontSize: 30.0,
fontWeight: FontWeight.w700,
),
],
),
],
margin: EdgeInsets.only(
left: SizeConfig.screenWidth * 0.004,
right: SizeConfig.screenWidth * 0.004,
top: SizeConfig.screenWidth * 0.04,
),
child: model.insuranceApproval.length != 0
? Column(
children: <Widget>[
Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
Row(
children: [
AppText(
'Insurance',
fontSize: 15.0,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
),
],
),
Row(
children: [
AppText(
'Approvals',
fontSize: 30.0,
fontWeight: FontWeight.w700,
),
],
),
],
),
),
),
...List.generate(
model.insuranceApproval.length,
(index) => Container(
child: InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
InsuranceApprovalsDetails(
patient: patient,
indexInsurance: index,
)),
);
},
child: DoctorCardInsurance(
patientOut: model
.insuranceApproval[index].patientDescription,
profileUrl:
model.insuranceApproval[index].doctorImage,
clinic: model.insuranceApproval[index].clinicName,
doctorName:
model.insuranceApproval[index].doctorName,
branch: model.insuranceApproval[index].approvalNo
.toString(),
isPrescriptions: true,
approvalStatus: model.insuranceApproval[index]
.approvalStatusDescption ??
'',
branch2:
model.insuranceApproval[index].projectName,
...List.generate(
model.insuranceApproval.length,
(index) => Container(
child: InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
InsuranceApprovalsDetails(
patient: patient,
indexInsurance: index,
)),
);
},
child: DoctorCardInsurance(
patientOut: model.insuranceApproval[index]
.patientDescription,
profileUrl:
model.insuranceApproval[index].doctorImage,
clinic:
model.insuranceApproval[index].clinicName,
doctorName:
model.insuranceApproval[index].doctorName,
branch: model
.insuranceApproval[index].approvalNo
.toString(),
isPrescriptions: true,
approvalStatus: model.insuranceApproval[index]
.approvalStatusDescption ??
'',
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/model/procedure/categories_procedure.dart';
import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart';
@ -69,7 +71,7 @@ class _EntityListCheckboxSearchWidgetState
NetworkBaseView(
baseViewModel: widget.model,
child: Container(
height: MediaQuery.of(context).size.height * 0.65,
height: MediaQuery.of(context).size.height * 0.75,
child: Center(
child: Container(
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/core/enum/viewstate.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/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_texts_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/services.dart';
import 'package:intl/intl.dart';
@ -24,6 +25,7 @@ import 'package:provider/provider.dart';
import '../../config/size_config.dart';
import '../../core/viewModel/auth_view_model.dart';
import '../../landing_page.dart';
import '../../routes.dart';
import '../../util/dr_app_shared_pref.dart';
import '../../util/helpers.dart';
@ -858,7 +860,7 @@ class _VerificationMethodsState extends State<VerificationMethods> {
sharedPref.setObj(DOCTOR_PROFILE, profile);
projectsProvider.isLogin = true;
Navigator.of(context).popAndPushNamed(HOME);
Navigator.pushAndRemoveUntil(context, FadePage(page: LandingPage(),), (r) => false);
}
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.onTap,
this.appointmentDate,
this.orderNo, this.isPrescriptions=false, this.clinic});
this.orderNo,
this.isPrescriptions = false,
this.clinic});
@override
Widget build(BuildContext context) {
@ -69,13 +71,13 @@ class DoctorCard extends StatelessWidget {
fontWeight: FontWeight.w600,
fontSize: 14,
),
if(!isPrescriptions)
Texts(
'${DateUtils.getHour(appointmentDate)}',
fontWeight: FontWeight.w600,
color: Colors.grey[700],
fontSize: 14,
),
if (!isPrescriptions)
Texts(
'${DateUtils.getHour(appointmentDate)}',
fontWeight: FontWeight.w600,
color: Colors.grey[700],
fontSize: 14,
),
],
),
),
@ -106,7 +108,8 @@ class DoctorCard extends StatelessWidget {
Row(
children: <Widget>[
Texts(
'order No:',
TranslationBase.of(context).orderNo +
": ",
color: Colors.grey[500],
fontSize: 14,
),
@ -120,7 +123,9 @@ class DoctorCard extends StatelessWidget {
Row(
children: <Widget>[
Texts(
'Invoice:',
TranslationBase.of(context)
.invoiceNo +
": ",
fontSize: 14,
color: Colors.grey[500],
),
@ -130,34 +135,36 @@ class DoctorCard extends StatelessWidget {
)
],
),
if(clinic!=null)
Row(
children: <Widget>[
Texts(
'Clinic: ',
color: Colors.grey[500],
fontSize: 14,
),
Texts(
clinic,
fontSize: 14,
)
],
),
if(branch!=null)
Row(
children: <Widget>[
Texts(
'Branch: ',
fontSize: 14,
color: Colors.grey[500],
),
Texts(
branch,
fontSize: 14,
)
],
)
if (clinic != null)
Row(
children: <Widget>[
Texts(
TranslationBase.of(context).clinic +
": ",
color: Colors.grey[500],
fontSize: 14,
),
Texts(
clinic,
fontSize: 14,
)
],
),
if (branch != null)
Row(
children: <Widget>[
Texts(
TranslationBase.of(context).branch +
": ",
fontSize: 14,
color: Colors.grey[500],
),
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/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:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/cupertino.dart';
@ -105,7 +106,7 @@ class DoctorCardInsurance extends StatelessWidget {
Expanded(
child: Texts(
doctorName,
fontWeight: FontWeight.w700,
bold: true,
)),
],
),
@ -155,15 +156,18 @@ class DoctorCardInsurance extends StatelessWidget {
Row(
children: <Widget>[
Texts(
'Clinic: ',
TranslationBase.of(context).clinic +
": ",
color: Colors.grey[500],
fontSize: 14,
//fontWeight: FontWeight.w600,
//color: Colors.grey[500],
),
Expanded(
child: Texts(
clinic,
fontWeight: FontWeight.w700,
fontSize: 15.0,
//fontWeight: FontWeight.w700,
fontSize: 14.0,
),
)
],
@ -172,26 +176,30 @@ class DoctorCardInsurance extends StatelessWidget {
Row(
children: <Widget>[
Texts(
'Branch:',
//color: Colors.grey[500],
TranslationBase.of(context).branch +
": ",
fontSize: 14,
color: Colors.grey[500],
),
Texts(
branch2,
fontWeight: FontWeight.w700,
fontSize: 15.0,
fontSize: 14.0,
)
],
),
Row(
children: <Widget>[
Texts(
'Approval No: ',
TranslationBase.of(context)
.approvalNo +
": ",
fontSize: 14,
color: Colors.grey[500],
//color: Colors.grey[500],
),
Texts(
branch,
fontWeight: FontWeight.w700,
fontSize: 15.0,
fontSize: 14.0,
)
],
),
@ -202,8 +210,7 @@ class DoctorCardInsurance extends StatelessWidget {
padding:
const EdgeInsets.symmetric(horizontal: 15.0),
child: Icon(
DoctorApp.view,
size: 22.0,
EvaIcons.eye,
),
)
],

Write Preview
Loading…
Cancel
Save