Merge branch 'development' into video-streaming-android
commit
96f2de2c35
@ -0,0 +1,16 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="24"
|
||||||
|
android:viewportHeight="24"
|
||||||
|
android:tint="?attr/colorControlNormal">
|
||||||
|
<path
|
||||||
|
android:fillColor="@android:color/white"
|
||||||
|
android:pathData="M8,8l-2,0l0,9l11,0l0,-2l-9,0z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="@android:color/white"
|
||||||
|
android:pathData="M22,3H10v10h12V3zM20,11h-8V7h8V11z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="@android:color/white"
|
||||||
|
android:pathData="M4,12l-2,0l0,9l11,0l0,-2l-9,0z"/>
|
||||||
|
</vector>
|
@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<corners android:radius="1000dp"/>
|
||||||
|
|
||||||
|
<solid android:color="@color/green_dark"/>
|
||||||
|
|
||||||
|
</shape>
|
@ -0,0 +1,4 @@
|
|||||||
|
enum PatientType{
|
||||||
|
IN_PATIENT,
|
||||||
|
OUT_PATIENT,
|
||||||
|
}
|
@ -0,0 +1,104 @@
|
|||||||
|
class MyReferralPatientRequestModel {
|
||||||
|
int channel;
|
||||||
|
int clinicID;
|
||||||
|
int doctorID;
|
||||||
|
int editedBy;
|
||||||
|
String firstName;
|
||||||
|
String from;
|
||||||
|
String iPAdress;
|
||||||
|
bool isLoginForDoctorApp;
|
||||||
|
int languageID;
|
||||||
|
String lastName;
|
||||||
|
String middleName;
|
||||||
|
int patientID;
|
||||||
|
String patientIdentificationID;
|
||||||
|
String patientMobileNumber;
|
||||||
|
bool patientOutSA;
|
||||||
|
int patientTypeID;
|
||||||
|
int projectID;
|
||||||
|
String sessionID;
|
||||||
|
String stamp;
|
||||||
|
String to;
|
||||||
|
String tokenID;
|
||||||
|
double versionID;
|
||||||
|
String vidaAuthTokenID;
|
||||||
|
|
||||||
|
MyReferralPatientRequestModel(
|
||||||
|
{this.channel,
|
||||||
|
this.clinicID,
|
||||||
|
this.doctorID,
|
||||||
|
this.editedBy,
|
||||||
|
this.firstName,
|
||||||
|
this.from,
|
||||||
|
this.iPAdress,
|
||||||
|
this.isLoginForDoctorApp,
|
||||||
|
this.languageID,
|
||||||
|
this.lastName,
|
||||||
|
this.middleName,
|
||||||
|
this.patientID,
|
||||||
|
this.patientIdentificationID,
|
||||||
|
this.patientMobileNumber,
|
||||||
|
this.patientOutSA,
|
||||||
|
this.patientTypeID,
|
||||||
|
this.projectID,
|
||||||
|
this.sessionID,
|
||||||
|
this.stamp,
|
||||||
|
this.to,
|
||||||
|
this.tokenID,
|
||||||
|
this.versionID,
|
||||||
|
this.vidaAuthTokenID});
|
||||||
|
|
||||||
|
MyReferralPatientRequestModel.fromJson(Map<String, dynamic> json) {
|
||||||
|
channel = json['Channel'];
|
||||||
|
clinicID = json['ClinicID'];
|
||||||
|
doctorID = json['DoctorID'];
|
||||||
|
editedBy = json['EditedBy'];
|
||||||
|
firstName = json['FirstName'];
|
||||||
|
from = json['From'];
|
||||||
|
iPAdress = json['IPAdress'];
|
||||||
|
isLoginForDoctorApp = json['IsLoginForDoctorApp'];
|
||||||
|
languageID = json['LanguageID'];
|
||||||
|
lastName = json['LastName'];
|
||||||
|
middleName = json['MiddleName'];
|
||||||
|
patientID = json['PatientID'];
|
||||||
|
patientIdentificationID = json['PatientIdentificationID'];
|
||||||
|
patientMobileNumber = json['PatientMobileNumber'];
|
||||||
|
patientOutSA = json['PatientOutSA'];
|
||||||
|
patientTypeID = json['PatientTypeID'];
|
||||||
|
projectID = json['ProjectID'];
|
||||||
|
sessionID = json['SessionID'];
|
||||||
|
stamp = json['stamp'];
|
||||||
|
to = json['To'];
|
||||||
|
tokenID = json['TokenID'];
|
||||||
|
versionID = json['VersionID'];
|
||||||
|
vidaAuthTokenID = json['VidaAuthTokenID'];
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() {
|
||||||
|
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||||
|
data['Channel'] = this.channel;
|
||||||
|
data['ClinicID'] = this.clinicID;
|
||||||
|
data['DoctorID'] = this.doctorID;
|
||||||
|
data['EditedBy'] = this.editedBy;
|
||||||
|
data['FirstName'] = this.firstName;
|
||||||
|
data['From'] = this.from;
|
||||||
|
data['IPAdress'] = this.iPAdress;
|
||||||
|
data['IsLoginForDoctorApp'] = this.isLoginForDoctorApp;
|
||||||
|
data['LanguageID'] = this.languageID;
|
||||||
|
data['LastName'] = this.lastName;
|
||||||
|
data['MiddleName'] = this.middleName;
|
||||||
|
data['PatientID'] = this.patientID;
|
||||||
|
data['PatientIdentificationID'] = this.patientIdentificationID;
|
||||||
|
data['PatientMobileNumber'] = this.patientMobileNumber;
|
||||||
|
data['PatientOutSA'] = this.patientOutSA;
|
||||||
|
data['PatientTypeID'] = this.patientTypeID;
|
||||||
|
data['ProjectID'] = this.projectID;
|
||||||
|
data['SessionID'] = this.sessionID;
|
||||||
|
data['stamp'] = this.stamp;
|
||||||
|
data['To'] = this.to;
|
||||||
|
data['TokenID'] = this.tokenID;
|
||||||
|
data['VersionID'] = this.versionID;
|
||||||
|
data['VidaAuthTokenID'] = this.vidaAuthTokenID;
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,12 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
class NavigationService {
|
||||||
|
final GlobalKey<NavigatorState> navigatorKey =
|
||||||
|
new GlobalKey<NavigatorState>();
|
||||||
|
Future<dynamic> navigateTo(String routeName) {
|
||||||
|
return navigatorKey.currentState.pushNamed(routeName);
|
||||||
|
}
|
||||||
|
Future<dynamic> pushNamedAndRemoveUntil(String routeName) {
|
||||||
|
return navigatorKey.currentState.pushNamedAndRemoveUntil(routeName,(asd)=>false);
|
||||||
|
}
|
||||||
|
}
|
@ -1,36 +0,0 @@
|
|||||||
import 'package:doctor_app_flutter/config/config.dart';
|
|
||||||
import 'package:doctor_app_flutter/core/service/base/base_service.dart';
|
|
||||||
import 'package:doctor_app_flutter/models/doctor/verify_referral_doctor_remarks.dart';
|
|
||||||
import 'package:doctor_app_flutter/models/patient/my_referral/my_referred_patient_model.dart';
|
|
||||||
import 'package:doctor_app_flutter/models/patient/request_my_referral_patient_model.dart';
|
|
||||||
|
|
||||||
class ReferredPatientService extends BaseService {
|
|
||||||
List<MyReferredPatientModel> _listMyReferredPatientModel = [];
|
|
||||||
|
|
||||||
List<MyReferredPatientModel> get listMyReferredPatientModel =>
|
|
||||||
_listMyReferredPatientModel;
|
|
||||||
|
|
||||||
RequestMyReferralPatientModel _requestMyReferralPatient =
|
|
||||||
RequestMyReferralPatientModel();
|
|
||||||
VerifyReferralDoctorRemarks _verifyreferraldoctorremarks =
|
|
||||||
VerifyReferralDoctorRemarks();
|
|
||||||
|
|
||||||
Future getMyReferredPatient() async {
|
|
||||||
await baseAppClient.post(
|
|
||||||
GET_MY_REFERRED_PATIENT,
|
|
||||||
onSuccess: (dynamic response, int statusCode) {
|
|
||||||
_listMyReferredPatientModel.clear();
|
|
||||||
response['List_MyReferredPatient'].forEach((v) {
|
|
||||||
listMyReferredPatientModel.add(MyReferredPatientModel.fromJson(v));
|
|
||||||
});
|
|
||||||
// print(response['List_MyReferredPatient']);
|
|
||||||
},
|
|
||||||
onFailure: (String error, int statusCode) {
|
|
||||||
hasError = true;
|
|
||||||
super.error = error;
|
|
||||||
},
|
|
||||||
body: _requestMyReferralPatient.toJson(),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,24 +0,0 @@
|
|||||||
import 'package:doctor_app_flutter/core/enum/viewstate.dart';
|
|
||||||
import 'package:doctor_app_flutter/core/service/patient/referred_patient_service.dart';
|
|
||||||
import 'package:doctor_app_flutter/models/patient/my_referral/my_referred_patient_model.dart';
|
|
||||||
|
|
||||||
import '../../locator.dart';
|
|
||||||
import 'base_view_model.dart';
|
|
||||||
|
|
||||||
class ReferredPatientViewModel extends BaseViewModel {
|
|
||||||
ReferredPatientService _referralPatientService =
|
|
||||||
locator<ReferredPatientService>();
|
|
||||||
|
|
||||||
List<MyReferredPatientModel> get listMyReferredPatientModel =>
|
|
||||||
_referralPatientService.listMyReferredPatientModel;
|
|
||||||
|
|
||||||
Future getMyReferredPatient() async {
|
|
||||||
setState(ViewState.Busy);
|
|
||||||
await _referralPatientService.getMyReferredPatient();
|
|
||||||
if (_referralPatientService.hasError) {
|
|
||||||
error = _referralPatientService.error;
|
|
||||||
setState(ViewState.Error);
|
|
||||||
} else
|
|
||||||
setState(ViewState.Idle);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,56 +1,56 @@
|
|||||||
class StartCallReq {
|
class StartCallReq {
|
||||||
int vCID;
|
String clincName;
|
||||||
bool isrecall;
|
int clinicId;
|
||||||
String tokenID;
|
String docSpec;
|
||||||
String generalid;
|
String docotrName;
|
||||||
int doctorId;
|
int doctorId;
|
||||||
|
String generalid;
|
||||||
bool isOutKsa;
|
bool isOutKsa;
|
||||||
|
bool isrecall;
|
||||||
String projectName;
|
String projectName;
|
||||||
String docotrName;
|
String tokenID;
|
||||||
String clincName;
|
int vCID;
|
||||||
String docSpec;
|
|
||||||
int clinicId;
|
|
||||||
|
|
||||||
StartCallReq(
|
StartCallReq(
|
||||||
{this.vCID,
|
{this.clincName,
|
||||||
this.isrecall,
|
this.clinicId,
|
||||||
this.tokenID,
|
this.docSpec,
|
||||||
this.generalid,
|
this.docotrName,
|
||||||
this.doctorId,
|
this.doctorId,
|
||||||
this.isOutKsa,
|
this.generalid,
|
||||||
this.projectName,
|
this.isOutKsa,
|
||||||
this.docotrName,
|
this.isrecall,
|
||||||
this.clincName,
|
this.projectName,
|
||||||
this.docSpec,
|
this.tokenID,
|
||||||
this.clinicId});
|
this.vCID});
|
||||||
|
|
||||||
StartCallReq.fromJson(Map<String, dynamic> json) {
|
StartCallReq.fromJson(Map<String, dynamic> json) {
|
||||||
vCID = json['VC_ID'];
|
clincName = json['clincName'];
|
||||||
isrecall = json['isrecall'];
|
clinicId = json['ClinicId'];
|
||||||
tokenID = json['TokenID'];
|
docSpec = json['Doc_Spec'];
|
||||||
generalid = json['generalid'];
|
docotrName = json['DocotrName'];
|
||||||
doctorId = json['DoctorId'];
|
doctorId = json['DoctorId'];
|
||||||
|
generalid = json['generalid'];
|
||||||
isOutKsa = json['IsOutKsa'];
|
isOutKsa = json['IsOutKsa'];
|
||||||
|
isrecall = json['isrecall'];
|
||||||
projectName = json['projectName'];
|
projectName = json['projectName'];
|
||||||
docotrName = json['DocotrName'];
|
tokenID = json['TokenID'];
|
||||||
clincName = json['clincName'];
|
vCID = json['VC_ID'];
|
||||||
docSpec = json['Doc_Spec'];
|
|
||||||
clinicId = json['ClinicId'];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, dynamic> toJson() {
|
Map<String, dynamic> toJson() {
|
||||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||||
data['VC_ID'] = this.vCID;
|
data['clincName'] = this.clincName;
|
||||||
data['isrecall'] = this.isrecall;
|
data['ClinicId'] = this.clinicId;
|
||||||
data['TokenID'] = this.tokenID;
|
data['Doc_Spec'] = this.docSpec;
|
||||||
data['generalid'] = this.generalid;
|
data['DocotrName'] = this.docotrName;
|
||||||
data['DoctorId'] = this.doctorId;
|
data['DoctorId'] = this.doctorId;
|
||||||
|
data['generalid'] = this.generalid;
|
||||||
data['IsOutKsa'] = this.isOutKsa;
|
data['IsOutKsa'] = this.isOutKsa;
|
||||||
|
data['isrecall'] = this.isrecall;
|
||||||
data['projectName'] = this.projectName;
|
data['projectName'] = this.projectName;
|
||||||
data['DocotrName'] = this.docotrName;
|
data['TokenID'] = this.tokenID;
|
||||||
data['clincName'] = this.clincName;
|
data['VC_ID'] = this.vCID;
|
||||||
data['Doc_Spec'] = this.docSpec;
|
|
||||||
data['ClinicId'] = this.clinicId;
|
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -0,0 +1,119 @@
|
|||||||
|
import 'package:doctor_app_flutter/config/size_config.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/model/referral/MyReferralPatientModel.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart';
|
||||||
|
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.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/util/date-utils.dart';
|
||||||
|
import 'package:doctor_app_flutter/util/helpers.dart';
|
||||||
|
import 'package:doctor_app_flutter/util/translations_delegate_base.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/buttons/app_buttons_widget.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
import '../../../../routes.dart';
|
||||||
|
|
||||||
|
class ReplySummeryOnReferralPatient extends StatefulWidget {
|
||||||
|
final MyReferralPatientModel referredPatient;
|
||||||
|
final String doctorReply;
|
||||||
|
|
||||||
|
ReplySummeryOnReferralPatient(this.referredPatient, this.doctorReply);
|
||||||
|
|
||||||
|
@override
|
||||||
|
_ReplySummeryOnReferralPatientState createState() =>
|
||||||
|
_ReplySummeryOnReferralPatientState(this.referredPatient);
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ReplySummeryOnReferralPatientState
|
||||||
|
extends State<ReplySummeryOnReferralPatient> {
|
||||||
|
final MyReferralPatientModel referredPatient;
|
||||||
|
|
||||||
|
_ReplySummeryOnReferralPatientState(this.referredPatient);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return BaseView<PatientReferralViewModel>(
|
||||||
|
builder: (_, model, w) => AppScaffold(
|
||||||
|
baseViewModel: model,
|
||||||
|
isShowAppBar: true,
|
||||||
|
appBarTitle: TranslationBase.of(context).summeryReply,
|
||||||
|
body: Container(
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
|
||||||
|
Expanded(
|
||||||
|
child: SingleChildScrollView(
|
||||||
|
child: Container(
|
||||||
|
width: double.infinity,
|
||||||
|
margin:
|
||||||
|
EdgeInsets.symmetric(horizontal: 16, vertical: 16),
|
||||||
|
padding: EdgeInsets.symmetric(
|
||||||
|
horizontal: 16, vertical: 16),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: Colors.white,
|
||||||
|
shape: BoxShape.rectangle,
|
||||||
|
borderRadius: BorderRadius.all(Radius.circular(8)),
|
||||||
|
border: Border.fromBorderSide(BorderSide(
|
||||||
|
color: Colors.white,
|
||||||
|
width: 1.0,
|
||||||
|
)),
|
||||||
|
),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
AppText(
|
||||||
|
TranslationBase.of(context).reply,
|
||||||
|
fontFamily: 'Poppins',
|
||||||
|
fontWeight: FontWeight.w700,
|
||||||
|
fontSize: 2.4 * SizeConfig.textMultiplier,
|
||||||
|
color: Color(0XFF2E303A),
|
||||||
|
),
|
||||||
|
AppText(
|
||||||
|
widget.doctorReply ?? '',
|
||||||
|
fontFamily: 'Poppins',
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
fontSize: 1.8 * SizeConfig.textMultiplier,
|
||||||
|
color: Color(0XFF2E303A),
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
height: 8,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Container(
|
||||||
|
margin:
|
||||||
|
EdgeInsets.symmetric(horizontal: 16, vertical: 16),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: AppButton(
|
||||||
|
onPressed: () {
|
||||||
|
Navigator.of(context).pop();
|
||||||
|
},
|
||||||
|
title: TranslationBase.of(context).cancel,
|
||||||
|
fontColor: Colors.white,
|
||||||
|
color: Colors.red[600],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(width: 4,),
|
||||||
|
Expanded(
|
||||||
|
child: AppButton(
|
||||||
|
onPressed: () {},
|
||||||
|
title: TranslationBase.of(context).noteConfirm,
|
||||||
|
fontColor: Colors.white,
|
||||||
|
color: Colors.green[600],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,349 @@
|
|||||||
|
import 'package:doctor_app_flutter/config/config.dart';
|
||||||
|
import 'package:doctor_app_flutter/config/size_config.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/models/patient/patiant_info_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/util/date-utils.dart';
|
||||||
|
import 'package:doctor_app_flutter/util/helpers.dart';
|
||||||
|
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
|
||||||
|
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:hexcolor/hexcolor.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
|
|
||||||
|
class GeneralLabResultHeader extends StatelessWidget
|
||||||
|
with PreferredSizeWidget {
|
||||||
|
final PatiantInformtion patient;
|
||||||
|
final String patientType;
|
||||||
|
final String arrivalType;
|
||||||
|
final String doctorName;
|
||||||
|
final String branch;
|
||||||
|
final DateTime appointmentDate;
|
||||||
|
final String profileUrl;
|
||||||
|
final String invoiceNO;
|
||||||
|
final String orderNo;
|
||||||
|
final bool isPrescriptions;
|
||||||
|
final bool isMedicalFile;
|
||||||
|
final String episode;
|
||||||
|
final String vistDate;
|
||||||
|
|
||||||
|
final String clinic;
|
||||||
|
GeneralLabResultHeader(
|
||||||
|
{this.patient,
|
||||||
|
this.patientType,
|
||||||
|
this.arrivalType,
|
||||||
|
this.doctorName,
|
||||||
|
this.branch,
|
||||||
|
this.appointmentDate,
|
||||||
|
this.profileUrl,
|
||||||
|
this.invoiceNO,
|
||||||
|
this.orderNo,
|
||||||
|
this.isPrescriptions = false,
|
||||||
|
this.clinic,
|
||||||
|
this.isMedicalFile = false,
|
||||||
|
this.episode,
|
||||||
|
this.vistDate});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
ProjectViewModel projectViewModel = Provider.of(context);
|
||||||
|
int gender = 1;
|
||||||
|
if (patient.patientDetails != null) {
|
||||||
|
gender = patient.patientDetails.gender;
|
||||||
|
} else {
|
||||||
|
gender = patient.gender;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Container(
|
||||||
|
padding: EdgeInsets.only(left: 0, right: 5, bottom: 5, top: 5),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: Colors.white,
|
||||||
|
),
|
||||||
|
height: MediaQuery.of(context).size.height * 0.23,
|
||||||
|
child: Container(
|
||||||
|
padding: EdgeInsets.only(left: 10, right: 10, bottom: 10),
|
||||||
|
margin: EdgeInsets.only(top: 50),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Container(
|
||||||
|
padding: EdgeInsets.only(left: 12.0),
|
||||||
|
child: Row(children: [
|
||||||
|
IconButton(
|
||||||
|
icon: Icon(Icons.arrow_back_ios),
|
||||||
|
color: Colors.black, //Colors.black,
|
||||||
|
onPressed: () => Navigator.pop(context),
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: AppText(
|
||||||
|
patient.firstName != null
|
||||||
|
? (Helpers.capitalize(patient.firstName) +
|
||||||
|
" " +
|
||||||
|
Helpers.capitalize(patient.lastName))
|
||||||
|
: Helpers.capitalize(patient.fullName??patient?.patientDetails?.fullName??""),
|
||||||
|
fontSize: SizeConfig.textMultiplier * 2.2,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
fontFamily: 'Poppins',
|
||||||
|
),
|
||||||
|
),
|
||||||
|
gender == 1
|
||||||
|
? Icon(
|
||||||
|
DoctorApp.male_2,
|
||||||
|
color: Colors.blue,
|
||||||
|
)
|
||||||
|
: Icon(
|
||||||
|
DoctorApp.female_1,
|
||||||
|
color: Colors.pink,
|
||||||
|
),
|
||||||
|
Container(
|
||||||
|
margin: EdgeInsets.symmetric(horizontal: 4),
|
||||||
|
child: InkWell(
|
||||||
|
onTap: () {
|
||||||
|
launch("tel://" + patient?.mobileNumber??"");
|
||||||
|
},
|
||||||
|
child: Icon(
|
||||||
|
Icons.phone,
|
||||||
|
color: Colors.black87,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
]),
|
||||||
|
),
|
||||||
|
Row(children: [
|
||||||
|
Padding(
|
||||||
|
padding: EdgeInsets.only(left: 12.0),
|
||||||
|
child: Container(
|
||||||
|
width: 60,
|
||||||
|
height: 60,
|
||||||
|
child: Image.asset(
|
||||||
|
gender == 1
|
||||||
|
? 'assets/images/male_avatar.png'
|
||||||
|
: 'assets/images/female_avatar.png',
|
||||||
|
fit: BoxFit.cover,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
width: 10,
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
SERVICES_PATIANT2[int.parse(patientType)] ==
|
||||||
|
"patientArrivalList"
|
||||||
|
? Container(
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
patient.patientStatusType == 43
|
||||||
|
? AppText(
|
||||||
|
TranslationBase.of(context).arrivedP,
|
||||||
|
color: Colors.green,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
fontFamily: 'Poppins',
|
||||||
|
fontSize: 12,
|
||||||
|
)
|
||||||
|
: AppText(
|
||||||
|
TranslationBase.of(context).notArrived,
|
||||||
|
color: Colors.red[800],
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
fontFamily: 'Poppins',
|
||||||
|
fontSize: 12,
|
||||||
|
),
|
||||||
|
arrivalType == '1' || patient.arrivedOn == null
|
||||||
|
? AppText(
|
||||||
|
patient.startTime != null
|
||||||
|
? patient.startTime
|
||||||
|
: '',
|
||||||
|
fontFamily: 'Poppins',
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
)
|
||||||
|
: AppText(
|
||||||
|
AppDateUtils.convertStringToDateFormat(
|
||||||
|
patient.arrivedOn,
|
||||||
|
'MM-dd-yyyy HH:mm'),
|
||||||
|
fontFamily: 'Poppins',
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
)
|
||||||
|
],
|
||||||
|
))
|
||||||
|
: SizedBox(),
|
||||||
|
if (SERVICES_PATIANT2[int.parse(patientType)] ==
|
||||||
|
"List_MyOutPatient")
|
||||||
|
Container(
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.start,
|
||||||
|
children: <Widget>[
|
||||||
|
AppText(
|
||||||
|
TranslationBase.of(context).appointmentDate +
|
||||||
|
" : ",
|
||||||
|
fontSize: 14,
|
||||||
|
),
|
||||||
|
patient.startTime != null
|
||||||
|
? Container(
|
||||||
|
height: 15,
|
||||||
|
width: 60,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
borderRadius: BorderRadius.circular(25),
|
||||||
|
color: HexColor("#20A169"),
|
||||||
|
),
|
||||||
|
child: AppText(
|
||||||
|
patient.startTime ?? "",
|
||||||
|
color: Colors.white,
|
||||||
|
fontSize: 1.5 * SizeConfig.textMultiplier,
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: SizedBox(),
|
||||||
|
SizedBox(
|
||||||
|
width: 3.5,
|
||||||
|
),
|
||||||
|
Container(
|
||||||
|
child: AppText(
|
||||||
|
convertDateFormat2(
|
||||||
|
patient.appointmentDate.toString() ?? ''),
|
||||||
|
fontSize: 1.5 * SizeConfig.textMultiplier,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
height: 0.5,
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
margin: EdgeInsets.only(
|
||||||
|
top: 8,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
RichText(
|
||||||
|
text: TextSpan(
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 1.6 * SizeConfig.textMultiplier,
|
||||||
|
color: Colors.black,
|
||||||
|
fontFamily: 'Poppins',
|
||||||
|
),
|
||||||
|
children: <TextSpan>[
|
||||||
|
new TextSpan(
|
||||||
|
text: TranslationBase.of(context).fileNumber,
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 14, fontFamily: 'Poppins')),
|
||||||
|
new TextSpan(
|
||||||
|
text: patient?.patientId?.toString() ?? "",
|
||||||
|
style: TextStyle(
|
||||||
|
fontWeight: FontWeight.w700,
|
||||||
|
fontFamily: 'Poppins',
|
||||||
|
fontSize: 14)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
AppText(
|
||||||
|
patient.nationalityName ??
|
||||||
|
patient.nationality ??
|
||||||
|
"",
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
fontSize: 12,
|
||||||
|
),
|
||||||
|
patient.nationality != null
|
||||||
|
? ClipRRect(
|
||||||
|
borderRadius: BorderRadius.circular(20.0),
|
||||||
|
child: Image.network(
|
||||||
|
patient?.nationalityFlagURL??"",
|
||||||
|
height: 25,
|
||||||
|
width: 30,
|
||||||
|
errorBuilder: (BuildContext context,
|
||||||
|
Object exception,
|
||||||
|
StackTrace stackTrace) {
|
||||||
|
return Text('No Image');
|
||||||
|
},
|
||||||
|
))
|
||||||
|
: SizedBox()
|
||||||
|
],
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Container(
|
||||||
|
child: RichText(
|
||||||
|
text: new TextSpan(
|
||||||
|
style: new TextStyle(
|
||||||
|
fontSize: 1.6 * SizeConfig.textMultiplier,
|
||||||
|
color: Colors.black,
|
||||||
|
fontFamily: 'Poppins',
|
||||||
|
),
|
||||||
|
children: <TextSpan>[
|
||||||
|
new TextSpan(
|
||||||
|
text: TranslationBase.of(context).age + " : ",
|
||||||
|
style: TextStyle(fontSize: 14)),
|
||||||
|
new TextSpan(
|
||||||
|
text:
|
||||||
|
"${AppDateUtils.getAgeByBirthday(patient.patientDetails != null ? patient.patientDetails.dateofBirth : patient.dateofBirth, context)}",
|
||||||
|
style: TextStyle(
|
||||||
|
fontWeight: FontWeight.w700, fontSize: 14)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Container(
|
||||||
|
child: RichText(
|
||||||
|
text: new TextSpan(
|
||||||
|
style: new TextStyle(
|
||||||
|
fontSize: 1.6 * SizeConfig.textMultiplier,
|
||||||
|
color: Colors.black,
|
||||||
|
fontFamily: 'Poppins',
|
||||||
|
),
|
||||||
|
children: <TextSpan>[
|
||||||
|
new TextSpan(
|
||||||
|
text: "Result Date: ",
|
||||||
|
style: TextStyle(fontSize: 14)),
|
||||||
|
new TextSpan(
|
||||||
|
text:
|
||||||
|
'${AppDateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}',
|
||||||
|
style: TextStyle(
|
||||||
|
fontWeight: FontWeight.w700, fontSize: 14)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
convertDateFormat2(String str) {
|
||||||
|
String newDate = "";
|
||||||
|
const start = "/Date(";
|
||||||
|
const end = "+0300)";
|
||||||
|
|
||||||
|
if (str.isNotEmpty) {
|
||||||
|
final startIndex = str.indexOf(start);
|
||||||
|
final endIndex = str.indexOf(end, startIndex + start.length);
|
||||||
|
|
||||||
|
var date = new DateTime.fromMillisecondsSinceEpoch(
|
||||||
|
int.parse(str.substring(startIndex + start.length, endIndex)));
|
||||||
|
newDate = date.year.toString() +
|
||||||
|
"/" +
|
||||||
|
date.month.toString().padLeft(2, '0') +
|
||||||
|
"/" +
|
||||||
|
date.day.toString().padLeft(2, '0');
|
||||||
|
}
|
||||||
|
|
||||||
|
return newDate.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@override
|
||||||
|
Size get preferredSize => Size(double.maxFinite, 310);
|
||||||
|
}
|
Loading…
Reference in New Issue