merge-requests/368/head
Sultan Khan 5 years ago
commit 5ca71f8fc0

Binary file not shown.

After

Width:  |  Height:  |  Size: 942 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 765 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 549 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 232 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 616 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1007 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 819 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 631 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 988 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 652 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 940 B

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart';
import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
@ -26,6 +27,7 @@ import 'package:provider/provider.dart';
class PatientProfileScreen extends StatelessWidget {
PatiantInformtion patient;
bool isFromSearch = false;
//TODO change it
@override
Widget build(BuildContext context) {
@ -63,7 +65,7 @@ class PatientProfileScreen extends StatelessWidget {
SliverList(
delegate: SliverChildListDelegate(
[
Column(
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
@ -181,7 +183,7 @@ class PatientProfileScreen extends StatelessWidget {
height: 4,
),
AppText(
"${DateUtils.convertDateFromServerFormat(patient.dateofBirth, 'dd-MM-yyyy')} / ${DateUtils.getAgeByBirthday(patient.dateofBirth, context) /*patient.age*/}",
"${DateUtils.convertDateFromServerFormat(patient.dateofBirth, 'dd-MM-yyyy')} / ${DateUtils.getAgeByBirthday(patient.dateofBirth, context)}",
fontWeight: FontWeight.normal,
fontSize: 1.6 *
SizeConfig.textMultiplier,
@ -559,6 +561,147 @@ class PatientProfileScreen extends StatelessWidget {
),
],
),
/* Container(
// margin: EdgeInsets.all(6),
padding: EdgeInsets.only(
left: 0, right: 5, bottom: 5, top: 5),
decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(15),
color: Colors.white,
),
child: Stack(
children: [
Container(
padding: EdgeInsets.only(
left: 10, right: 10, bottom: 10),
child: Column(
children: [
Row(
children: [
Padding(
padding: EdgeInsets.only(left: 12.0),
child: Container(
width: 60,
height: 60,
child: Image.asset(
patient.gender == 1
? 'assets/images/male_avatar.png'
: 'assets/images/female_avatar.png',
fit: BoxFit.cover,
),
),
),
SizedBox(
width: 10,
),
Expanded(
child: Column(
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,
),
patientType == '1'
? AppText(
patient.startTime !=
null
? patient
.startTime
: '',
fontFamily:
'Poppins',
fontWeight:
FontWeight
.w600,
)
: AppText(
DateUtils.convertStringToDateFormat(
patient
.arrivedOn,
'MM-dd-yyyy HH:mm'),
fontFamily:
'Poppins',
fontWeight:
FontWeight
.w600,
)
],
))
: SizedBox(),
Row(
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
children: [
RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: 2.0 * SizeConfig.textMultiplier,
color: Colors.black),
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: 15)),
],
),
),
],
)
],
),
)
],
crossAxisAlignment: CrossAxisAlignment.start,
),
],
),
),
],
),
),*/
],
),
),

@ -33,7 +33,7 @@ class MyReferralDetailScreen extends StatelessWidget {
return BaseView<PatientReferralViewModel>(
onModelReady: (model) => model.getPatientDetails(
DateUtils.convertStringToDateFormat(
DateTime.now().subtract(Duration(days: 350)).toString(),
DateTime.now()/*.subtract(Duration(days: 350))*/.toString(),
"yyyy-MM-dd"),
DateUtils.convertStringToDateFormat(
DateTime.now().toString(), "yyyy-MM-dd"),

@ -70,7 +70,7 @@ packages:
name: build
url: "https://pub.dartlang.org"
source: hosted
version: "1.6.1"
version: "1.6.2"
build_config:
dependency: transitive
description:
@ -84,35 +84,35 @@ packages:
name: build_daemon
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.6"
version: "2.1.7"
build_modules:
dependency: transitive
description:
name: build_modules
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.3"
version: "3.0.4"
build_resolvers:
dependency: transitive
description:
name: build_resolvers
url: "https://pub.dartlang.org"
source: hosted
version: "1.5.2"
version: "1.5.3"
build_runner:
dependency: "direct dev"
description:
name: build_runner
url: "https://pub.dartlang.org"
source: hosted
version: "1.11.0"
version: "1.11.1"
build_runner_core:
dependency: transitive
description:
name: build_runner_core
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.6"
version: "6.1.7"
build_web_compilers:
dependency: "direct dev"
description:
@ -203,7 +203,7 @@ packages:
name: code_builder
url: "https://pub.dartlang.org"
source: hosted
version: "3.6.0"
version: "3.7.0"
collection:
dependency: transitive
description:
@ -308,14 +308,14 @@ packages:
name: dropdown_search
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.8"
version: "0.4.9"
equatable:
dependency: transitive
description:
name: equatable
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.5"
version: "1.2.6"
eva_icons_flutter:
dependency: "direct main"
description:
@ -392,7 +392,7 @@ packages:
name: fl_chart
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.2"
version: "0.12.3"
flutter:
dependency: "direct main"
description: flutter
@ -475,7 +475,7 @@ packages:
name: font_awesome_flutter
url: "https://pub.dartlang.org"
source: hosted
version: "8.11.0"
version: "8.12.0"
get_it:
dependency: "direct main"
description:
@ -559,14 +559,14 @@ packages:
name: io
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.4"
version: "0.3.5"
js:
dependency: transitive
description:
name: js
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.3-nullsafety.1"
version: "0.6.2"
json_annotation:
dependency: transitive
description:
@ -706,21 +706,21 @@ packages:
name: percent_indicator
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.9"
version: "2.1.9+1"
permission_handler:
dependency: "direct main"
description:
name: permission_handler
url: "https://pub.dartlang.org"
source: hosted
version: "5.0.1+1"
version: "5.1.0+2"
permission_handler_platform_interface:
dependency: transitive
description:
name: permission_handler_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
version: "2.0.2"
petitparser:
dependency: transitive
description:
@ -769,7 +769,7 @@ packages:
name: protobuf
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.1.3"
provider:
dependency: "direct main"
description:
@ -790,7 +790,7 @@ packages:
name: pubspec_parse
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.7"
version: "0.1.8"
quiver:
dependency: transitive
description:
@ -853,7 +853,7 @@ packages:
name: shared_preferences_windows
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.2+2"
version: "0.0.2+3"
shelf:
dependency: transitive
description:
@ -867,7 +867,7 @@ packages:
name: shelf_web_socket
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.3"
version: "0.2.4+1"
sky_engine:
dependency: transitive
description: flutter
@ -991,7 +991,7 @@ packages:
name: url_launcher_web
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.5+1"
version: "0.1.5+3"
url_launcher_windows:
dependency: transitive
description:
@ -1061,7 +1061,7 @@ packages:
name: win32
url: "https://pub.dartlang.org"
source: hosted
version: "1.7.4"
version: "1.7.4+1"
xdg_directories:
dependency: transitive
description:

@ -106,6 +106,7 @@ flutter:
- assets/images/
- assets/images/dashboard/
- assets/images/login/
- assets/images/patient/
# An image asset can refer to one or more resolution-specific "variants", see
# https://flutter.dev/assets-and-images/#resolution-aware.

Loading…
Cancel
Save