|
|
|
|
@ -6,7 +6,7 @@
|
|
|
|
|
|
|
|
|
|
*@desc:
|
|
|
|
|
*/
|
|
|
|
|
import 'package:doctor_app_flutter/models/patient_model.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/models/patient/patient_model.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/providers/patients_provider.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/routes.dart';
|
|
|
|
|
import 'package:doctor_app_flutter/screens/patients/TopTenUsersModelResponse.dart';
|
|
|
|
|
@ -30,12 +30,11 @@ class PatientsScreen extends StatefulWidget {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
class _PatientsScreenState extends State<PatientsScreen> {
|
|
|
|
|
List<dynamic> litems;
|
|
|
|
|
//*******************
|
|
|
|
|
List<PatiantInformtion> responseModelList;
|
|
|
|
|
//List<PatiantInformtion<dynamic>> litems2;
|
|
|
|
|
//*******************
|
|
|
|
|
|
|
|
|
|
List<dynamic> litems;
|
|
|
|
|
//*******************
|
|
|
|
|
List<PatiantInformtion> responseModelList;
|
|
|
|
|
//List<PatiantInformtion<dynamic>> litems2;
|
|
|
|
|
//*******************
|
|
|
|
|
|
|
|
|
|
bool _isInit = true;
|
|
|
|
|
|
|
|
|
|
@ -45,21 +44,21 @@ class _PatientsScreenState extends State<PatientsScreen> {
|
|
|
|
|
//*******Amjad add to search box******
|
|
|
|
|
final _controller = TextEditingController();
|
|
|
|
|
//**************
|
|
|
|
|
PatientModel patient;
|
|
|
|
|
|
|
|
|
|
PatientModel patient;
|
|
|
|
|
|
|
|
|
|
@override
|
|
|
|
|
void didChangeDependencies() {
|
|
|
|
|
final routeArgs = ModalRoute.of(context).settings.arguments as Map;
|
|
|
|
|
//PatientModel patient = routeArgs['patientSearchForm'];
|
|
|
|
|
patient = routeArgs['patientSearchForm'];
|
|
|
|
|
|
|
|
|
|
patient = routeArgs['patientSearchForm'];
|
|
|
|
|
|
|
|
|
|
//PatiantInformtion patiantInfo = routeArgs['patientSearchForm'];
|
|
|
|
|
|
|
|
|
|
print(patient.TokenID+"EEEEEE");
|
|
|
|
|
print(patient.TokenID + "EEEEEE");
|
|
|
|
|
String patientType = routeArgs['selectedType'];
|
|
|
|
|
print("**************patiant Type**************");
|
|
|
|
|
print(patientType);
|
|
|
|
|
print("**************test**************");
|
|
|
|
|
print("**************test**************");
|
|
|
|
|
if (_isInit) {
|
|
|
|
|
// setState(() {});
|
|
|
|
|
PatientsProvider patientsProv = Provider.of<PatientsProvider>(context);
|
|
|
|
|
@ -67,20 +66,20 @@ class _PatientsScreenState extends State<PatientsScreen> {
|
|
|
|
|
// print('MessageStatus${res['MessageStatus']}');
|
|
|
|
|
print('List_MyInPatient${(res['List_MyInPatient'])}');
|
|
|
|
|
setState(() {
|
|
|
|
|
int val2=int.parse(patientType);
|
|
|
|
|
litems =res[SERVICES_PATIANT2[val2]];//res['List_MyInPatient'];
|
|
|
|
|
int val2 = int.parse(patientType);
|
|
|
|
|
litems = res[SERVICES_PATIANT2[val2]]; //res['List_MyInPatient'];
|
|
|
|
|
//********************
|
|
|
|
|
// litems2=res[SERVICES_PATIANT2[val2]];
|
|
|
|
|
//PatiantInformtion
|
|
|
|
|
//List<PatiantInformtion> responseModelList = new PatiantInformtion.fromJson(litems).;//TopTenUsersModelResponse.fromJson(parsed).list;
|
|
|
|
|
final List parsed = litems;//json.decode(response.body);
|
|
|
|
|
//List<PatientModel> responseModelList = new TopTenUsersModelResponse.fromJson(parsed).list;
|
|
|
|
|
// List<PatiantInformtion> responseModelList = new TopTenUsersModelResponse.fromJson(parsed).list;
|
|
|
|
|
responseModelList = new TopTenUsersModelResponse.fromJson(parsed).list;
|
|
|
|
|
// litems2=res[SERVICES_PATIANT2[val2]];
|
|
|
|
|
//PatiantInformtion
|
|
|
|
|
//List<PatiantInformtion> responseModelList = new PatiantInformtion.fromJson(litems).;//TopTenUsersModelResponse.fromJson(parsed).list;
|
|
|
|
|
final List parsed = litems; //json.decode(response.body);
|
|
|
|
|
//List<PatientModel> responseModelList = new TopTenUsersModelResponse.fromJson(parsed).list;
|
|
|
|
|
// List<PatiantInformtion> responseModelList = new TopTenUsersModelResponse.fromJson(parsed).list;
|
|
|
|
|
responseModelList =
|
|
|
|
|
new TopTenUsersModelResponse.fromJson(parsed).list;
|
|
|
|
|
//********************
|
|
|
|
|
_isLoading = false;
|
|
|
|
|
_hasError = res['ErrorEndUserMessage'];
|
|
|
|
|
|
|
|
|
|
_hasError = res['ErrorEndUserMessage'];
|
|
|
|
|
});
|
|
|
|
|
print(res);
|
|
|
|
|
}).catchError((error) {
|
|
|
|
|
@ -93,60 +92,73 @@ class _PatientsScreenState extends State<PatientsScreen> {
|
|
|
|
|
|
|
|
|
|
@override
|
|
|
|
|
Widget build(BuildContext context) {
|
|
|
|
|
PatientsProvider patientsProv = Provider.of<PatientsProvider>(context);
|
|
|
|
|
|
|
|
|
|
return AppScaffold(
|
|
|
|
|
appBarTitle: 'Patients',
|
|
|
|
|
//***********Modify by amjad (create List view to insert all new data webservise in scroll )*************
|
|
|
|
|
body: Container(child:ListView(
|
|
|
|
|
scrollDirection: Axis.vertical,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Container(
|
|
|
|
|
//child:litems == null?Column():Column(children: <Widget>[
|
|
|
|
|
child:litems == null?Column():Column(children: <Widget>[
|
|
|
|
|
Container(
|
|
|
|
|
width: SizeConfig.screenWidth * 0.80,
|
|
|
|
|
child: TextField(
|
|
|
|
|
controller: _controller,
|
|
|
|
|
onSubmitted: (value) {
|
|
|
|
|
// fetch all the news related to the keyword
|
|
|
|
|
if (value.isNotEmpty) {
|
|
|
|
|
// vm.search(value);
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
decoration: buildInputDecoration(
|
|
|
|
|
context, 'Search patiant'),
|
|
|
|
|
appBarTitle: 'Patients',
|
|
|
|
|
//***********Modify by amjad (create List view to insert all new data webservise in scroll )*************
|
|
|
|
|
body: Container(
|
|
|
|
|
child: ListView(
|
|
|
|
|
scrollDirection: Axis.vertical,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Container(
|
|
|
|
|
//child:litems == null?Column():Column(children: <Widget>[
|
|
|
|
|
child: litems == null
|
|
|
|
|
? Column()
|
|
|
|
|
: Column(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Container(
|
|
|
|
|
width: SizeConfig.screenWidth * 0.80,
|
|
|
|
|
child: TextField(
|
|
|
|
|
controller: _controller,
|
|
|
|
|
onSubmitted: (value) {
|
|
|
|
|
// fetch all the news related to the keyword
|
|
|
|
|
if (value.isNotEmpty) {
|
|
|
|
|
// vm.search(value);
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
decoration:
|
|
|
|
|
buildInputDecoration(context, 'Search patiant'),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
Column(children: responseModelList.map((PatiantInformtion item) {
|
|
|
|
|
return InkWell(
|
|
|
|
|
child: CardWithBgWidget(
|
|
|
|
|
|
|
|
|
|
line1Text:item.nationalityName,//item['FirstName'],//patient.getFirstName(),//item['FirstName'],
|
|
|
|
|
line2Text:item.lastName, //responseModelList['LastName'],//item['LastName'],//'12/04/2020 - 02:00 PM',
|
|
|
|
|
// line3Text: item.middleName,
|
|
|
|
|
heightPercentage: 0.15,
|
|
|
|
|
widthPercentage: 0.80),
|
|
|
|
|
onTap: (){
|
|
|
|
|
Navigator.of(context).pushNamed(PATIENTS_PROFILE, arguments: {"patient": responseModelList});
|
|
|
|
|
},
|
|
|
|
|
);
|
|
|
|
|
}).toList())
|
|
|
|
|
Column(
|
|
|
|
|
children:
|
|
|
|
|
responseModelList.map((PatiantInformtion item) {
|
|
|
|
|
return InkWell(
|
|
|
|
|
child: CardWithBgWidget(
|
|
|
|
|
line1Text: item
|
|
|
|
|
.nationalityName, //item['FirstName'],//patient.getFirstName(),//item['FirstName'],
|
|
|
|
|
line2Text: item
|
|
|
|
|
.lastName, //responseModelList['LastName'],//item['LastName'],//'12/04/2020 - 02:00 PM',
|
|
|
|
|
// line3Text: item.middleName,
|
|
|
|
|
heightPercentage: 0.15,
|
|
|
|
|
widthPercentage: 0.80),
|
|
|
|
|
onTap: () =>
|
|
|
|
|
tapOnPatient(context, item, patientsProv),
|
|
|
|
|
);
|
|
|
|
|
}).toList())
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
))
|
|
|
|
|
);
|
|
|
|
|
)));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void tapOnPatient(BuildContext context, PatiantInformtion patient,
|
|
|
|
|
PatientsProvider patientsProv) {
|
|
|
|
|
patientsProv.setSelectedPatient(patient);
|
|
|
|
|
Navigator.of(context)
|
|
|
|
|
.pushNamed(PATIENTS_PROFILE, arguments: {"patient": patient});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//***********amjad update*************
|
|
|
|
|
InputDecoration buildInputDecoration(BuildContext context, hint) {
|
|
|
|
|
InputDecoration buildInputDecoration(BuildContext context, hint) {
|
|
|
|
|
return InputDecoration(
|
|
|
|
|
prefixIcon:Icon(Icons.search,color: Colors.red),
|
|
|
|
|
prefixIcon: Icon(Icons.search, color: Colors.red),
|
|
|
|
|
filled: true,
|
|
|
|
|
fillColor: Colors.white,
|
|
|
|
|
//Image.asset(asset),
|
|
|
|
|
/* icon: Padding(
|
|
|
|
|
/* icon: Padding(
|
|
|
|
|
padding: const EdgeInsets.all(8.0),
|
|
|
|
|
child: Icon(Icons.search),
|
|
|
|
|
),*/
|
|
|
|
|
@ -164,30 +176,5 @@ class _PatientsScreenState extends State<PatientsScreen> {
|
|
|
|
|
}
|
|
|
|
|
//*************
|
|
|
|
|
}
|
|
|
|
|
//***********************
|
|
|
|
|
//***********************
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class CustomShapeClipper extends CustomClipper<Path> {
|
|
|
|
|
@override
|
|
|
|
|
Path getClip(Size size) {
|
|
|
|
|
final Path path = Path();
|
|
|
|
|
path.lineTo(0.0, size.height);
|
|
|
|
|
|
|
|
|
|
var firstEndPoint = Offset(size.width * .5, size.height / 2);
|
|
|
|
|
var firstControlpoint = Offset(size.width * 0.25, size.height * 0.95 + 30);
|
|
|
|
|
path.quadraticBezierTo(firstControlpoint.dx, firstControlpoint.dy,
|
|
|
|
|
firstEndPoint.dx, firstEndPoint.dy);
|
|
|
|
|
|
|
|
|
|
var secondEndPoint = Offset(size.width, size.height * 0.10);
|
|
|
|
|
var secondControlPoint = Offset(size.width * .75, size.height * .10 - 20);
|
|
|
|
|
path.quadraticBezierTo(secondControlPoint.dx, secondControlPoint.dy,
|
|
|
|
|
secondEndPoint.dx, secondEndPoint.dy);
|
|
|
|
|
|
|
|
|
|
path.lineTo(size.width, 0.0);
|
|
|
|
|
path.close();
|
|
|
|
|
return path;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@override
|
|
|
|
|
bool shouldReclip(CustomClipper oldClipper) => true;
|
|
|
|
|
}
|
|
|
|
|
|
Elham Rababah
5 years ago