Haroon6138
/
diplomatic-quarter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Weight, height and blood pressure on Home Page

Browse Source
merge-requests/390/head
Mirza.Shafique 3 years ago
parent 876463c945
commit 29fd552874
12 changed files with 220 additions and 88 deletions
Show Stats Download Patch File Download Diff File

11
assets/images/new/blood.svg
Unescape Escape View File

@ -0,0 +1,11 @@
<svg xmlns="http://www.w3.org/2000/svg" width="12.133" height="14.092" viewBox="0 0 12.133 14.092">
<g id="water-drop" transform="translate(-26.6)">
<g id="Group_8137" data-name="Group 8137" transform="translate(26.6)">
<g id="Group_8136" data-name="Group 8136" transform="translate(0)">
<path id="Path_4725" data-name="Path 4725" d="M30.826,44.113a2.469,2.469,0,0,0,.722-1.752,2.291,2.291,0,0,0-.191-.825,6.688,6.688,0,0,0-.515-.942c0-.015-.015-.015-.015-.029a18.423,18.423,0,0,0-1.458-1.826l-.294-.339-.294.339c-.913,1.06-2.179,2.518-2.179,3.622a2.522,2.522,0,0,0,.722,1.752,2.469,2.469,0,0,0,1.752.722A2.522,2.522,0,0,0,30.826,44.113Z" transform="translate(-26.6 -36.986)" fill="#fff"/>
<path id="Path_4726" data-name="Path 4726" d="M283.243.088,283.169,0,283.1.088c-.545.633-1.3,1.5-1.3,2.12a1.369,1.369,0,1,0,2.739,0C284.539,1.59,283.788.722,283.243.088Z" transform="translate(-272.405)" fill="#fff"/>
<path id="Path_4727" data-name="Path 4727" d="M72.394,58c-.221.265-.471.545-.722.854l-.383.442a5.762,5.762,0,0,1,.442.839,2.846,2.846,0,0,1,.25,1.1,3.218,3.218,0,0,1-3.225,3.225,2.58,2.58,0,0,1-.589-.059c-.074-.015-.133-.029-.206-.044l-.088.353a3.237,3.237,0,0,0-.074.648,4.635,4.635,0,0,0,1.34,3.254,4.573,4.573,0,0,0,3.254,1.34,4.635,4.635,0,0,0,3.254-1.34,4.548,4.548,0,0,0,1.34-3.254c0-2.017-2.253-4.609-3.873-6.494C72.865,58.545,72.63,58.265,72.394,58Z" transform="translate(-66.283 -55.865)" fill="#fff"/>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

7
assets/images/new/email.svg
Unescape Escape View File

@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20.13" height="16.906" viewBox="0 0 20.13 16.906">
<g id="mail_2_" data-name="mail (2)" transform="translate(0 -41)">
<path id="Path_4587" data-name="Path 4587" d="M7.352,54.722c0-4.442,0-4.99,0-4.992s-.129,0-1.672,0a.6.6,0,0,1-.607-.563.59.59,0,0,1,.589-.617c1.559,0,1.683,0,1.691,0s0-.5,0-4.363a.59.59,0,0,1,.59-.59h6.645a8.453,8.453,0,1,0,0,11.716H7.942a.59.59,0,0,1-.59-.59Zm-2.32-8.689h.925a.6.6,0,0,1,.607.563.59.59,0,0,1-.589.617H5.051a.6.6,0,0,1-.607-.563A.59.59,0,0,1,5.033,46.033Zm.629,6.212H3.793a.6.6,0,0,1-.607-.563.59.59,0,0,1,.589-.617H5.643a.6.6,0,0,1,.607.563A.59.59,0,0,1,5.662,52.245Z" transform="translate(0 0)" fill="#fff"/>
<path id="Path_4588" data-name="Path 4588" d="M246.26,137H236.212l5.1,3.93Z" transform="translate(-226.925 -92.226)" fill="#fff"/>
<path id="Path_4589" data-name="Path 4589" d="M223.225,163.51a.59.59,0,0,1-.727.005l-5.5-4.239v7.861a.59.59,0,0,0,.59.59h10.419a.59.59,0,0,0,.59-.59v-7.893Z" transform="translate(-208.468 -113.595)" fill="#fff"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

9
assets/images/new/height.svg
Unescape Escape View File

@ -0,0 +1,9 @@
<svg xmlns="http://www.w3.org/2000/svg" width="12.111" height="15.251" viewBox="0 0 12.111 15.251">
<g id="Page-1" transform="translate(-3 -10.54)">
<g id="_028---Height-Restrictions" data-name="028---Height-Restrictions" transform="translate(3 10.54)">
<path id="Shape" d="M1.875,1.268V15.736A.268.268,0,0,1,1.608,16H.268A.268.268,0,0,1,0,15.736V15.2H.8a.268.268,0,0,0,0-.536H0v-.536H.536a.268.268,0,0,0,0-.536H0v-.536H.8a.268.268,0,0,0,0-.536H0v-.536H.536a.268.268,0,0,0,0-.536H0v-.536H.8a.268.268,0,0,0,0-.536H0V9.842H.536a.268.268,0,0,0,0-.536H0V8.77H.8a.268.268,0,0,0,0-.536H0V7.7H.536a.268.268,0,0,0,0-.536H0V6.626H.8a.268.268,0,0,0,0-.536H0V5.555H.536a.268.268,0,0,0,0-.536H0V4.483H.8a.268.268,0,0,0,0-.536H0V3.411H.536a.268.268,0,0,0,0-.536H0V2.34H.8A.268.268,0,0,0,.8,1.8H0V1.268A.268.268,0,0,1,.268,1h1.34A.268.268,0,0,1,1.875,1.268Z" transform="translate(0 -0.877)" fill="#fff"/>
<path id="Shape-2" data-name="Shape" d="M48.49,14.06H48V2.271h.49a.268.268,0,0,0,.2-.442L47.668.634a.268.268,0,0,0-.407,0L46.234,1.829a.268.268,0,0,0,.2.442h.49V14.06h-.49a.268.268,0,0,0-.2.442L47.26,15.7a.268.268,0,0,0,.407,0L48.694,14.5a.268.268,0,0,0-.2-.442Z" transform="translate(-36.647 -0.54)" fill="#fff"/>
<path id="Path_4986" data-name="Path 4986" d="M63,8.578a19.554,19.554,0,0,0,.246,2.179,3.366,3.366,0,0,1,.12.894,3.249,3.249,0,0,0-.045.941,3.056,3.056,0,0,1-.008,1.031,7.515,7.515,0,0,0-.142.765c-.239.6-.1.573-.1.573.074.091.2.007.2.007a.124.124,0,0,0,.163-.015.149.149,0,0,0,.179-.008.184.184,0,0,0,.2-.046c.06.03.074-.008.074-.008.179-.011-.1-.585-.1-.585a1.567,1.567,0,0,1,.066-.8c.437-1.295.459-1.638.284-2.126-.049-.141-.062-.2-.039-.258.052-.141.014-.709.078-.934a20.228,20.228,0,0,0,.308-2.052,3.971,3.971,0,0,0-.3-1.622,10.389,10.389,0,0,1,.039-1.725,1.634,1.634,0,0,1,.167.745,3.091,3.091,0,0,0,.4,1.261,2.03,2.03,0,0,1,.285.636c0,.091-.02.31-.02.31l.008.191a2.728,2.728,0,0,1,.027.3c-.032.5.047.405.047.405.067,0,.14-.4.14-.4a1.721,1.721,0,0,0,.031.531c.067.139.116-.024.117-.057.018-.635.056-.469.056-.469.037.515.083.632.165.592.062-.03.005-.619.005-.619.106.35.187.406.187.406.175.123.067-.217.043-.284a1.933,1.933,0,0,1-.134-.482c.162.322.284.31.284.31.158-.05-.138-.506-.312-.724a1.774,1.774,0,0,1-.236-.348,4.209,4.209,0,0,1-.095-.631,1.9,1.9,0,0,0-.157-.814,2.942,2.942,0,0,1-.285-1.1l-.011-1.21c-.084-.825-.692-.831-.692-.831-.615-.091-.7-.29-.7-.29a.867.867,0,0,1-.056-.546.653.653,0,0,0,.15-.321c.179-.138.171-.339.088-.337-.066,0-.051-.053-.051-.053A.766.766,0,0,0,62.985,0h-.123a.766.766,0,0,0-.693.952s.015.055-.052.053c-.083,0-.09.2.088.337a.653.653,0,0,0,.15.321.867.867,0,0,1-.056.546s-.085.2-.7.29c0,0-.609.006-.692.831L60.9,4.54a2.923,2.923,0,0,1-.285,1.1,1.9,1.9,0,0,0-.156.814,4.236,4.236,0,0,1-.095.631,1.754,1.754,0,0,1-.236.348c-.175.218-.469.672-.312.724,0,0,.123.012.284-.31a1.914,1.914,0,0,1-.133.482c-.025.066-.134.407.042.284,0,0,.081-.056.187-.406,0,0-.057.589.006.619.082.04.127-.076.164-.592,0,0,.038-.166.056.469,0,.033.049.2.116.057a1.7,1.7,0,0,0,.031-.531s.073.4.141.4c0,0,.08.094.047-.405a2.508,2.508,0,0,1,.027-.3l.008-.191s-.02-.219-.02-.31a2.028,2.028,0,0,1,.285-.636,3.093,3.093,0,0,0,.4-1.261,1.638,1.638,0,0,1,.167-.745,10.53,10.53,0,0,1,.04,1.725,3.964,3.964,0,0,0-.3,1.622,19.977,19.977,0,0,0,.307,2.052c.064.225.026.793.078.934.023.062.011.118-.039.258-.174.488-.151.832.285,2.126a1.553,1.553,0,0,1,.066.8s-.279.574-.1.585c0,0,.014.038.074.008a.184.184,0,0,0,.2.046.148.148,0,0,0,.179.008.123.123,0,0,0,.163.015s.127.085.2-.007c0,0,.134.03-.1-.573a7.48,7.48,0,0,0-.141-.765,3.072,3.072,0,0,1-.008-1.031,3.306,3.306,0,0,0-.045-.941,3.294,3.294,0,0,1,.119-.894,19.672,19.672,0,0,0,.246-2.179l.073.026A.149.149,0,0,0,63,8.578Z" transform="translate(-57.069 0.123)" fill="#fff"/>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

7
assets/images/new/weight.svg
Unescape Escape View File

@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="11.809" height="11.809" viewBox="0 0 11.809 11.809">
<g id="weight_1_" data-name="weight (1)" transform="translate(4)">
<g id="Group_8200" data-name="Group 8200" transform="translate(-4)">
<path id="Path_4985" data-name="Path 4985" d="M10.735,0H1.074A1.075,1.075,0,0,0,0,1.074v9.662a1.075,1.075,0,0,0,1.074,1.074h9.662a1.075,1.075,0,0,0,1.074-1.074V1.074A1.075,1.075,0,0,0,10.735,0ZM9.32,3.4,7.8,4.923a.268.268,0,0,1-.38,0,2.183,2.183,0,0,0-2.037-.541L4.807,3.109a.268.268,0,0,0-.489.222l.564,1.24a2,2,0,0,0-.5.351.268.268,0,0,1-.379,0L2.489,3.4a.268.268,0,0,1,0-.379,4.83,4.83,0,0,1,6.832,0A.268.268,0,0,1,9.32,3.4Z" fill="#fff"/>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 714 B

7
lib/pages/landing/fragments/home_page_fragment2.dart
Unescape Escape View File

@ -1,5 +1,6 @@
import 'package:auto_size_text/auto_size_text.dart';
import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/core/viewModels/dashboard_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart';
import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
@ -24,9 +25,11 @@ import 'package:provider/provider.dart';
import 'dart:math' as math;
class HomePageFragment2 extends StatefulWidget {
DashboardViewModel model;
Function onPharmacyClick, onLoginClick;
HomePageFragment2({this.onLoginClick, this.onPharmacyClick});
HomePageFragment2(this.model,{this.onLoginClick, this.onPharmacyClick});
@override
_HomePageFragment2State createState() => _HomePageFragment2State();
@ -81,7 +84,7 @@ class _HomePageFragment2State extends State<HomePageFragment2> {
child: LoggedSliderView(
projectViewModel,
new SliderData(TranslationBase.of(context).fileno + ": " + projectViewModel.user.patientID.toString(), projectViewModel.user.firstName + ' ' + projectViewModel.user.lastName,
"", bannerColor[0].darkColor, bannerColor[0].lightColor)),
"", bannerColor[0].darkColor, bannerColor[0].lightColor),widget.model),
),
),
)

2
lib/pages/landing/fragments/logged_home_page_fragment.dart
Unescape Escape View File

@ -93,7 +93,7 @@ class _HomePageFragmentState extends State<LoggedHomePageFragment> {
child: LoggedSliderView(
widget.projectViewModel,
new SliderData(TranslationBase.of(context).fileno + ": " + widget.projectViewModel.user.patientID.toString(),
widget.projectViewModel.user.firstName + ' ' + widget.projectViewModel.user.lastName, "", bannerColor[0].darkColor, bannerColor[0].lightColor)),
widget.projectViewModel.user.firstName + ' ' + widget.projectViewModel.user.lastName, "", bannerColor[0].darkColor, bannerColor[0].lightColor),null),
),
),
appoCountProvider.count == 0

1
lib/pages/landing/home_page_2.dart
Unescape Escape View File

@ -66,6 +66,7 @@ class _HomePageState2 extends State<HomePage2> {
// },
// ),
HomePageFragment2(
model,
onLoginClick: () {
widget.onLoginClick();
},

74
lib/pages/landing/widgets/logged_slider_view.dart
Unescape Escape View File

@ -1,17 +1,21 @@
import 'package:diplomaticquarterapp/core/viewModels/dashboard_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/extensions/string_extensions.dart';
import 'package:diplomaticquarterapp/models/slider_data.dart';
import 'package:flutter_svg/flutter_svg.dart';
class LoggedSliderView extends StatelessWidget {
ProjectViewModel projectViewModel;
SliderData sliderData;
DashboardViewModel model;
LoggedSliderView(this.projectViewModel, this.sliderData);
LoggedSliderView(this.projectViewModel, this.sliderData, this.model);
@override
Widget build(BuildContext context) {
@ -53,7 +57,7 @@ class LoggedSliderView extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
mFlex(3),
mFlex(2),
Row(
children: [
Container(
@ -87,7 +91,7 @@ class LoggedSliderView extends StatelessWidget {
mWidth(MediaQuery.of(context).size.width / 70),
],
),
mFlex(2),
mFlex(1),
Padding(
padding: const EdgeInsets.only(left: 20, right: 20),
child: Column(
@ -103,6 +107,7 @@ class LoggedSliderView extends StatelessWidget {
height: 25 / 17,
),
),
mHeight(3),
Text(
sliderData.pateintId,
style: TextStyle(
@ -115,11 +120,11 @@ class LoggedSliderView extends StatelessWidget {
],
),
),
mFlex(3),
mHeight(3),
Padding(
padding: const EdgeInsets.only(left: 20, right: 20),
child: Text(
"34 Years, Male, 4 January 1987",
'${DateUtil.getMonthDayYearDateFormatted(projectViewModel.user.dateofBirthDataTime)} ,${projectViewModel.user.gender == 1 ? TranslationBase.of(context).male : TranslationBase.of(context).female} ${projectViewModel.user.age.toString() + "y"}',
style: TextStyle(
color: Colors.white,
fontSize: 12,
@ -128,7 +133,64 @@ class LoggedSliderView extends StatelessWidget {
),
),
),
mFlex(4),
mFlex(3),
Padding(
padding: const EdgeInsets.only(left: 20, right: 20),
child: Row(
children: <Widget>[
Expanded(
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/new/height.svg',
width: 12,
height: 12,
),
mWidth(6),
Texts(
"${model.heightCm} ${TranslationBase.of(context).cm}",
color: Colors.white,
fontSize: 9,
)
],
),
),
SizedBox(
width: 3,
),
Expanded(
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/new/weight.svg',
width: 12,
height: 12,
),
mWidth(6),
Texts('${model.weightKg} ${TranslationBase.of(context).kg}', color: Colors.white, fontSize: 9)
],
),
),
SizedBox(
width: 3,
),
Expanded(
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/new/blood.svg',
width: 12,
height: 12,
),
mWidth(6),
Texts('${model.booldType}', color: Colors.white, fontSize: 9)
],
),
),
],
),
),
mFlex(2),
],
),
),

180
lib/pages/medical/radiology/radiology_home_page.dart
Unescape Escape View File

@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/core/enum/filter_type.dart';
import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
import 'package:diplomaticquarterapp/core/model/radiology/final_radiology.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/radiology_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
@ -7,6 +8,7 @@ import 'package:diplomaticquarterapp/pages/medical/radiology/radiology_details_p
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/widgets/new_design/my_tab_view.dart';
import 'package:diplomaticquarterapp/widgets/others/app_expandable_notifier.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
@ -16,95 +18,119 @@ import 'package:provider/provider.dart';
class RadiologyHomePage extends StatelessWidget {
List<ImagesInfo> imagesInfo = List();
@override
Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-radiology/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-radiology/ar/0.png'));
imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-radiology/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-radiology/ar/1.png'));
imagesInfo.add(
ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-radiology/en/0.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-radiology/ar/0.png'));
imagesInfo.add(
ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-radiology/en/1.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-radiology/ar/1.png'));
return BaseView<RadiologyViewModel>(
onModelReady: (model) => model.getPatientRadOrders(),
builder: (_, model, widget) => AppScaffold(
isShowAppBar: true,
appBarTitle: TranslationBase.of(context).radiology,
baseViewModel: model,
showNewAppBar: true,
showNewAppBarTitle: true,
backgroundColor: Color(0xffF8F8F8),
description: TranslationBase.of(context).infoRadiology,
imagesInfo: imagesInfo,
body: FractionallySizedBox(
widthFactor: 1.0,
child: ListView(
physics: BouncingScrollPhysics(),
children: <Widget>[
Row(
children: <Widget>[
Expanded(
flex: 1,
child: InkWell(
onTap: () =>
model.setFilterType(FilterType.Clinic),
child: ListTile(
title: Text(TranslationBase.of(context).clinic),
leading: Radio(
value: FilterType.Clinic,
groupValue: model.filterType,
onChanged: (FilterType value) {
model.setFilterType(value);
},
),
),
),
),
Expanded(
flex: 1,
child: InkWell(
onTap: () => model
.setFilterType(FilterType.Hospital),
child: ListTile(
title: Text(TranslationBase.of(context).hospital),
leading: Radio(
value: FilterType.Hospital,
groupValue: model.filterType,
onChanged: (FilterType value) {
model.setFilterType(value);
},
),
),
),
)
],
body: Column(
children: <Widget>[
Row(
children: <Widget>[
MyTabView(TranslationBase.of(context).byClinic, FilterType.Clinic, model.filterType, () {
model.setFilterType(FilterType.Clinic);
}),
MyTabView(TranslationBase.of(context).byHospital, FilterType.Hospital, model.filterType, () {
model.setFilterType(FilterType.Hospital);
}),
],
),
Expanded(
child: FractionallySizedBox(
widthFactor: 1.0,
child: ListView.separated(
physics: BouncingScrollPhysics(),
separatorBuilder: (context, index) {
return Container(
height: 1,
margin: EdgeInsets.only(left: 21, right: 21),
color: Color(0xffD9D9D9),
);
},
itemBuilder: (context, index) {
return AppExpandableNotifier(
title: model.finalRadiologyList[index].filterName,
bodyWidget: ListView.separated(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21),
itemBuilder: (context, _index) {
FinalRadiology radiology = model.finalRadiologyList[index].finalRadiologyList[_index];
bool _isSortByClinic = model.filterType == FilterType.Clinic;
return DoctorCard(
onTap: () => Navigator.push(
context,
FadePage(
page: RadiologyDetailsPage(
finalRadiology: radiology,
),
),
),
isInOutPatient: radiology.isInOutPatient,
name: TranslationBase.of(context).dr + " " + radiology.doctorName,
billNo: radiology.invoiceNo.toString(),
profileUrl: radiology.doctorImageURL,
subName: _isSortByClinic ? radiology.projectName : radiology.clinicDescription,
isLiveCareAppointment: radiology.isLiveCareAppointment,
date: radiology.orderDate,
isSortByClinic: _isSortByClinic,
//projectViewModel.isArabic ? DateUtil.getMonthDayYearDateFormattedAr(labOrder.orderDate) : DateUtil.getMonthDayYearDateFormatted(labOrder.orderDate),
);
},
separatorBuilder: (context, index) => SizedBox(height: 14),
itemCount: model.finalRadiologyList[index].finalRadiologyList.length),
);
},
itemCount: model.finalRadiologyList.length),
),
...List.generate(
model.finalRadiologyList.length,
(index) => AppExpandableNotifier(
title: model
.finalRadiologyList[index].filterName,
bodyWidget: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: model
.finalRadiologyList[index].finalRadiologyList
.map((radiology) {
return InkWell(
onTap: () => Navigator.push(
context,
FadePage(
page: RadiologyDetailsPage(finalRadiology: radiology,),
),
),
child: DoctorCard(
isInOutPatient: radiology.isInOutPatient,
isLiveCareAppointment: radiology.isLiveCareAppointment,
name: radiology.doctorName,
profileUrl: radiology.doctorImageURL,
billNo: '${radiology.invoiceNo}',
subName: '${radiology.projectName}',
date: radiology.orderDate//projectViewModel.isArabic? DateUtil.getMonthDayYearDateFormattedAr(radiology.orderDate):DateUtil.getMonthDayYearDateFormatted(radiology.orderDate),
),
);
}).toList(),
)),
)
],
),
),
// ...List.generate(
// model.finalRadiologyList.length,
// (index) => AppExpandableNotifier(
// title: model
// .finalRadiologyList[index].filterName,
// bodyWidget: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: model
// .finalRadiologyList[index].finalRadiologyList
// .map((radiology) {
// return InkWell(
// onTap: () => Navigator.push(
// context,
// FadePage(
// page: RadiologyDetailsPage(finalRadiology: radiology,),
// ),
// ),
// child: DoctorCard(
// isInOutPatient: radiology.isInOutPatient,
// isLiveCareAppointment: radiology.isLiveCareAppointment,
// name: radiology.doctorName,
// profileUrl: radiology.doctorImageURL,
// billNo: '${radiology.invoiceNo}',
// subName: '${radiology.projectName}',
// date: radiology.orderDate//projectViewModel.isArabic? DateUtil.getMonthDayYearDateFormattedAr(radiology.orderDate):DateUtil.getMonthDayYearDateFormatted(radiology.orderDate),
// ),
// );
// }).toList(),
// )),
// )
],
),
),
);

2
lib/theme/theme_value.dart
Unescape Escape View File

@ -30,7 +30,7 @@ defaultTheme({fontName}) {
hintColor: Colors.grey[400],
disabledColor: Colors.grey[300],
errorColor: Color.fromRGBO(235, 80, 60, 1.0),
scaffoldBackgroundColor: Color(0xffE9E9E9),
scaffoldBackgroundColor: Color(0xffF8F8F8),
// Colors.grey[100],
textSelectionColor: Color.fromRGBO(80, 100, 253, 0.5),
textSelectionHandleColor: Colors.grey,

2
lib/widgets/data_display/medical/doctor_card.dart
Unescape Escape View File

@ -39,7 +39,7 @@ class DoctorCard extends StatelessWidget {
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
blurRadius: 12,
offset: Offset(0, -3),
),
],

6
lib/widgets/nfc/nfc_reader_sheet.dart
Unescape Escape View File

@ -58,6 +58,12 @@ class _NfcLayoutState extends State<NfcLayout> {
Navigator.pop(context);
});
print("read NDEF id: ${message.id}");
print("NFC Record "+message.payload);
print("NFC Record Lenght "+message.records.length.toString());
print("NFC Record "+message.records.first.id);
print("NFC Record "+message.records.first.payload);
print("NFC Record "+message.records.first.data);
print("NFC Record "+message.records.first.type);
// widget.onNcfScan(message.id);
nfcId = message.id;
}, onError: (e) {

Write Preview
Loading…
Cancel
Save