Haroon6138
/
RSGPatientApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hospital text replaced with branch

Browse Source
dev_v3.13.6
Sikander Saleem 5 years ago
parent b4031e973e
commit 8b49eed6ae
10 changed files with 595 additions and 540 deletions
Show Stats Download Patch File Download Diff File

1
lib/config/localized_values.dart
Unescape Escape View File

@ -617,6 +617,7 @@ const Map localizedValues = {
"lakumTransfer": {"en": "Lakum Transfer", "ar": "تفعيل الحساب"}, "lakumTransfer": {"en": "Lakum Transfer", "ar": "تفعيل الحساب"},
"acceptLbl": {"en": "Accept", "ar": "موافقة"}, "acceptLbl": {"en": "Accept", "ar": "موافقة"},
"select-gender": {"en": "Select Gender", "ar": "اختر الجنس"}, "select-gender": {"en": "Select Gender", "ar": "اختر الجنس"},
"please_select_gender": {"en": "Please select gender", "ar": "يرجى تحديد الجنس"},
"i-am-a": {"en": "I am a ...", "ar": "أنا ..."}, "i-am-a": {"en": "I am a ...", "ar": "أنا ..."},
"select-age": {"en": "Select Your Age", "ar": "حدد العمر"}, "select-age": {"en": "Select Your Age", "ar": "حدد العمر"},
"i-am": {"en": "I am", "ar": "أنا"}, "i-am": {"en": "I am", "ar": "أنا"},

161
lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
Unescape Escape View File

@ -39,17 +39,9 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
TextEditingController _mobileTextController = TextEditingController(); TextEditingController _mobileTextController = TextEditingController();
bool _isSubmitted = false; bool _isSubmitted = false;
dynamic _selectedCountry = { dynamic _selectedCountry = {"name": "Saudi Arabia", "name_ar": "المملكة العربية السعودية", "code": "+966", "countryCode": "SA", "pattern": "5xxxxxxxx", "maxLength": 9};
"name": "Saudi Arabia",
"name_ar": "المملكة العربية السعودية",
"code": "+966",
"countryCode": "SA",
"pattern": "5xxxxxxxx",
"maxLength": 9
};
SearchCriteriaModel selectedCriteria = SearchCriteriaModel( SearchCriteriaModel selectedCriteria = SearchCriteriaModel(name: "Identification Number", nameAr: "رقم المحول", value: 1);
name: "Identification Number", nameAr: "رقم المحول", value: 1);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -59,23 +51,15 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
if (projectViewModel.isLogin) { if (projectViewModel.isLogin) {
Future.delayed(new Duration(milliseconds: 300)).then((value) async { Future.delayed(new Duration(milliseconds: 300)).then((value) async {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
SearchEReferralRequestModel searchEReferralRequestModel = SearchEReferralRequestModel searchEReferralRequestModel = new SearchEReferralRequestModel(
new SearchEReferralRequestModel( patientMobileNumber: (projectViewModel.user.outSA == 0 ? "966" : "971") + projectViewModel.user.mobileNumber.substring(1, projectViewModel.user.mobileNumber.length),
patientMobileNumber: (projectViewModel.user.outSA == 0
? "966"
: "971") +
projectViewModel.user.mobileNumber
.substring(1, projectViewModel.user.mobileNumber.length),
); );
if (selectedCriteria.value == 1) { if (selectedCriteria.value == 1) {
searchEReferralRequestModel.identificationNo = searchEReferralRequestModel.identificationNo = _searchTextController.text;
_searchTextController.text;
searchEReferralRequestModel.referralNumber = 0; searchEReferralRequestModel.referralNumber = 0;
} else { } else {
searchEReferralRequestModel.referralNumber = searchEReferralRequestModel.referralNumber = int.parse(_searchTextController.text);
int.parse(_searchTextController.text); searchEReferralRequestModel.identificationNo = projectViewModel.user.patientIdentificationNo;
searchEReferralRequestModel.identificationNo =
projectViewModel.user.patientIdentificationNo;
} }
await model.getEReferrals(searchEReferralRequestModel); await model.getEReferrals(searchEReferralRequestModel);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
@ -102,15 +86,10 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
padding: EdgeInsets.all(12), padding: EdgeInsets.all(12),
width: double.infinity, width: double.infinity,
height: 65, height: 65,
decoration: BoxDecoration( decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
borderRadius: BorderRadius.circular(12),
color: Colors.white),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [Texts(getSearchCriteriaName()), Icon(Icons.arrow_drop_down)],
Texts(getSearchCriteriaName()),
Icon(Icons.arrow_drop_down)
],
), ),
), ),
), ),
@ -118,9 +97,7 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
height: 12, height: 12,
), ),
NewTextFields( NewTextFields(
hintText: selectedCriteria.value == 1 hintText: selectedCriteria.value == 1 ? "Enter Patient Identification No" : "Enter Referral Number",
? "Enter Patient Identification No"
: "Enter Referral Number",
controller: _searchTextController, controller: _searchTextController,
onChanged: (_) { onChanged: (_) {
setState(() {}); setState(() {});
@ -135,15 +112,10 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
padding: EdgeInsets.all(12), padding: EdgeInsets.all(12),
width: double.infinity, width: double.infinity,
height: 65, height: 65,
decoration: BoxDecoration( decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
borderRadius: BorderRadius.circular(12),
color: Colors.white),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [Texts(getCountryName()), Icon(Icons.arrow_drop_down)],
Texts(getCountryName()),
Icon(Icons.arrow_drop_down)
],
), ),
), ),
), ),
@ -155,31 +127,21 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
onChange: (_) { onChange: (_) {
setState(() {}); setState(() {});
}, },
code: _selectedCountry == null code: _selectedCountry == null ? "11" : _selectedCountry["code"],
? "11"
: _selectedCountry["code"],
), ),
SizedBox( SizedBox(
height: 12, height: 12,
), ),
if ((model.state == ViewState.Idle && if ((model.state == ViewState.Idle && model.allReferral.length == 0)) Center(child: Text(TranslationBase.of(context).noSearchResult)),
model.allReferral.length == 0)) if ((model.state == ViewState.ErrorLocal)) AppEmbeddedError(error: model.error),
Center(
child: Text(
TranslationBase.of(context).noSearchResult)),
if ((model.state == ViewState.ErrorLocal))
AppEmbeddedError(error: model.error),
model.allReferral.length > 0 model.allReferral.length > 0
? NetworkBaseView( ? NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: ListView.separated( child: ListView.separated(
separatorBuilder: (context, index) => separatorBuilder: (context, index) => SizedBox(height: 0),
SizedBox(height: 0),
shrinkWrap: true, shrinkWrap: true,
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
itemCount: model.allReferral == null itemCount: model.allReferral == null ? 0 : model.allReferral.length,
? 0
: model.allReferral.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return Container( return Container(
width: double.infinity, width: double.infinity,
@ -188,9 +150,7 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
Navigator.push( Navigator.push(
context, context,
FadePage( FadePage(
page: ReferralDetails( page: ReferralDetails(referral: model.allReferral[index]),
referral:
model.allReferral[index]),
), ),
); );
}, },
@ -200,71 +160,22 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
child: Padding( child: Padding(
padding: const EdgeInsets.all(12.0), padding: const EdgeInsets.all(12.0),
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.spaceBetween,
MainAxisAlignment.spaceBetween,
children: [ children: [
Column( Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: [ children: [
Text( Text(projectViewModel.isArabic ? model.allReferral[index].statusAr : model.allReferral[index].status,
projectViewModel.isArabic style: TextStyle(fontSize: 14.0, letterSpacing: -0.56, fontWeight: FontWeight.bold)),
? model
.allReferral[
index]
.statusAr
: model
.allReferral[
index]
.status,
style: TextStyle(
fontSize: 14.0,
letterSpacing: -0.56,
fontWeight:
FontWeight.bold)),
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(top: 5.0),
top: 5.0), child: myRichText(TranslationBase.of(context).patientName + ": ", model.allReferral[index].patientName, projectViewModel.isArabic)),
child: myRichText( myRichText(TranslationBase.of(context).hospital + ": ", model.allReferral[index].preferredBranchName, projectViewModel.isArabic),
TranslationBase.of( myRichText(TranslationBase.of(context).referralDate + ": ",
context) DateUtil.getMonthDayYearDateFormatted(DateUtil.convertStringToDateNoTimeZone(model.allReferral[index].referralDate)), projectViewModel.isArabic),
.patientName +
": ",
model
.allReferral[
index]
.patientName,
projectViewModel
.isArabic)),
myRichText(
TranslationBase.of(
context)
.hospital +
": ",
model.allReferral[index]
.preferredBranchName,
projectViewModel
.isArabic),
myRichText(
TranslationBase.of(
context)
.referralDate +
": ",
DateUtil.getMonthDayYearDateFormatted(
DateUtil.convertStringToDateNoTimeZone(
model
.allReferral[
index]
.referralDate)),
projectViewModel
.isArabic),
], ],
), ),
Icon(projectViewModel.isArabic Icon(projectViewModel.isArabic ? Icons.arrow_back_ios_outlined : Icons.arrow_forward_outlined),
? Icons
.arrow_back_ios_outlined
: Icons
.arrow_forward_outlined),
], ],
), ),
), ),
@ -289,23 +200,17 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
padding: EdgeInsets.all(14), padding: EdgeInsets.all(14),
child: DefaultButton( child: DefaultButton(
TranslationBase.of(context).search, TranslationBase.of(context).search,
(_searchTextController.text.isEmpty || (_searchTextController.text.isEmpty || _mobileTextController.text.isEmpty)
_mobileTextController.text.isEmpty)
? null ? null
: () async { : () async {
SearchEReferralRequestModel SearchEReferralRequestModel searchEReferralRequestModel = new SearchEReferralRequestModel(
searchEReferralRequestModel = patientMobileNumber: _selectedCountry['code'] + _mobileTextController.text,
new SearchEReferralRequestModel(
patientMobileNumber: _selectedCountry['code'] +
_mobileTextController.text,
); );
if (selectedCriteria.value == 1) { if (selectedCriteria.value == 1) {
searchEReferralRequestModel.identificationNo = searchEReferralRequestModel.identificationNo = _searchTextController.text;
_searchTextController.text;
searchEReferralRequestModel.referralNumber = 0; searchEReferralRequestModel.referralNumber = 0;
} else { } else {
searchEReferralRequestModel.referralNumber = searchEReferralRequestModel.referralNumber = int.parse(_searchTextController.text);
int.parse(_searchTextController.text);
searchEReferralRequestModel.identificationNo = ''; searchEReferralRequestModel.identificationNo = '';
} }
await model.getEReferrals(searchEReferralRequestModel); await model.getEReferrals(searchEReferralRequestModel);

175
lib/pages/AlHabibMedicalService/h2o/h20_setting.dart
Unescape Escape View File

@ -8,6 +8,7 @@ import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -95,31 +96,42 @@ class _H2oSettingState extends State<H2oSetting> {
return AppScaffold( return AppScaffold(
isShowAppBar: true, isShowAppBar: true,
appBarTitle: TranslationBase.of(context).h2o, appBarTitle: TranslationBase.of(context).h2o,
showNewAppBar: true,
showNewAppBarTitle: true,
backgroundColor: Color(0xffF7F7F7),
showHomeAppBarIcon: false, showHomeAppBarIcon: false,
body: SingleChildScrollView( body: Column(
padding: EdgeInsets.fromLTRB(8, 8, 8, 80), children: [
Expanded(
child: SingleChildScrollView(
physics: BouncingScrollPhysics(),
padding: EdgeInsets.all(21),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
TextField( inputWidget(TranslationBase.of(context).enterNameHere, TranslationBase.of(context).enterNameHere, _nameController),
controller: _nameController, // TextField(
decoration: InputDecoration( // controller: _nameController,
labelText: TranslationBase.of(context).enterNameHere, // decoration: InputDecoration(
labelStyle: TextStyle(color: Colors.black87), // labelText: TranslationBase.of(context).enterNameHere,
fillColor: Colors.white, // labelStyle: TextStyle(color: Colors.black87),
filled: true, // fillColor: Colors.white,
border: UnderlineInputBorder( // filled: true,
borderSide: BorderSide( // border: UnderlineInputBorder(
width: 0, // borderSide: BorderSide(
style: BorderStyle.none, // width: 0,
), // style: BorderStyle.none,
borderRadius: BorderRadius.circular(6.0), // ),
), // borderRadius: BorderRadius.circular(6.0),
), // ),
// ),
// ),
SizedBox(height: 16),
Text(
TranslationBase.of(context).preferredunit,
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12),
), ),
SizedBox(height: 8), SizedBox(height: 12),
Text(TranslationBase.of(context).preferredunit),
SizedBox(height: 8),
_commonButtonsRow(TranslationBase.of(context).ml, TranslationBase.of(context).l, _isUnitML, (value) { _commonButtonsRow(TranslationBase.of(context).ml, TranslationBase.of(context).l, _isUnitML, (value) {
if (_isUnitML != value) { if (_isUnitML != value) {
setState(() { setState(() {
@ -127,12 +139,12 @@ class _H2oSettingState extends State<H2oSetting> {
}); });
} }
}), }),
Padding( SizedBox(height: 12),
padding: EdgeInsets.only(top: 8.0, bottom: 8.0), Text(
child: Divider(height: 1.5, color: Colors.black54), TranslationBase.of(context).pleaseSelectGender,
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12),
), ),
Text(TranslationBase.of(context).gender), SizedBox(height: 12),
SizedBox(height: 8),
_commonButtonsRow(TranslationBase.of(context).male, TranslationBase.of(context).female, _isGenderMale, (value) { _commonButtonsRow(TranslationBase.of(context).male, TranslationBase.of(context).female, _isGenderMale, (value) {
if (_isGenderMale != value) { if (_isGenderMale != value) {
setState(() { setState(() {
@ -140,10 +152,7 @@ class _H2oSettingState extends State<H2oSetting> {
}); });
} }
}), }),
Padding( SizedBox(height: 12),
padding: EdgeInsets.only(top: 8.0, bottom: 8.0),
child: Divider(height: 1.5, color: Colors.black54),
),
Text(TranslationBase.of(context).height), Text(TranslationBase.of(context).height),
_commonSlidersRow(_heightController, 1, 270, _heightValue, (text) { _commonSlidersRow(_heightController, 1, 270, _heightValue, (text) {
_heightController.text = text; _heightController.text = text;
@ -302,7 +311,103 @@ class _H2oSettingState extends State<H2oSetting> {
style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.w600), style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.w600),
), ),
), ),
) ),
],
),
),
),
Container(
color: Colors.white,
padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21),
child: DefaultButton(
TranslationBase.of(context).save,
_updateUserDetails,
color: Color(0xff349745),
),
),
],
),
);
}
Widget inputWidget(String _labelText, String _hintText, TextEditingController _controller, {String prefix, bool isEnable = true, bool hasSelection = false}) {
return Container(
padding: EdgeInsets.only(left: 16, right: 16, bottom: 15, top: 15),
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15),
color: Colors.white,
border: Border.all(
color: Color(0xffefefef),
width: 1,
),
),
child: InkWell(
onTap: hasSelection ? () {} : null,
child: Row(
children: [
Expanded(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
_labelText,
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.44,
),
),
TextField(
enabled: isEnable,
scrollPadding: EdgeInsets.zero,
keyboardType: TextInputType.number,
controller: _controller,
onChanged: (value) => {
// validateForm()
},
style: TextStyle(
fontSize: 14,
height: 21 / 14,
fontWeight: FontWeight.w400,
color: Color(0xff2B353E),
letterSpacing: -0.44,
),
decoration: InputDecoration(
isDense: true,
hintText: _hintText,
hintStyle: TextStyle(
fontSize: 14,
height: 21 / 14,
fontWeight: FontWeight.w400,
color: Color(0xff575757),
letterSpacing: -0.56,
),
prefixIconConstraints: BoxConstraints(minWidth: 50),
prefixIcon: prefix == null
? null
: Text(
"+" + prefix,
style: TextStyle(
fontSize: 14,
height: 21 / 14,
fontWeight: FontWeight.w500,
color: Color(0xff2E303A),
letterSpacing: -0.56,
),
),
contentPadding: EdgeInsets.zero,
border: InputBorder.none,
focusedBorder: InputBorder.none,
enabledBorder: InputBorder.none,
),
),
],
),
),
if (hasSelection) Icon(Icons.keyboard_arrow_down_outlined),
], ],
), ),
), ),
@ -310,6 +415,16 @@ class _H2oSettingState extends State<H2oSetting> {
} }
Widget _commonButtonsRow(String rightText, String leftText, bool checkParam, Function(bool) callBack) { Widget _commonButtonsRow(String rightText, String leftText, bool checkParam, Function(bool) callBack) {
return Row(
children: [
Row(children: [
Checkbox(value: null, onChanged: null)
],)
],
);
return Row(children: [ return Row(children: [
Expanded( Expanded(
child: SizedBox( child: SizedBox(

159
lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
Unescape Escape View File

@ -3,6 +3,7 @@ import 'dart:ui';
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart'; import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/H2O_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/H2O_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/h20_setting.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/h20_setting.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/month_page.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/month_page.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/today_page.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/today_page.dart';
@ -13,11 +14,12 @@ import 'package:diplomaticquarterapp/pages/medical/medical_profile_page_new.dart
import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/routes.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/bottom_navigation/bottom_nav_bar.dart'; import 'package:diplomaticquarterapp/widgets/bottom_navigation/bottom_nav_bar.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/extensions/string_extensions.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class H2OPage extends StatefulWidget { class H2OPage extends StatefulWidget {
@override @override
@ -44,24 +46,27 @@ class _H2OPageState extends State<H2OPage> with SingleTickerProviderStateMixin {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return BaseView<H2OViewModel>( return BaseView<H2OViewModel>(
onModelReady: (model) => model.getUserDetail(), onModelReady: (model) => model.getUserDetail(),
builder: (_, model, widget) => AppScaffold( builder: (_, model, widget) => AppScaffold(
isShowAppBar: true, isShowAppBar: true,
appBarTitle: TranslationBase.of(context).waterTracker, appBarTitle: TranslationBase.of(context).waterTracker,
description: TranslationBase.of(context).h2oInfo, description: TranslationBase.of(context).h2oInfo,
showNewAppBar: true,
showNewAppBarTitle: true,
backgroundColor: Color(0xffF7F7F7),
imagesInfo: [ imagesInfo: [
ImagesInfo( ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/h2o/en/0.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/h2o/ar/0.png')
imageEn: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/h2o/en/0.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/h2o/ar/0.png')
], ],
showHomeAppBarIcon: false, showHomeAppBarIcon: false,
baseViewModel: model, baseViewModel: model,
isHelp: true, isHelp: true,
appBarIcons: [ appBarIcons: [
model.isLogin if (model.isLogin)
? IconButton( IconButton(
icon: Image.asset("assets/images/new-design/setting_gear_icon.png"), icon: Icon(Icons.settings),
color: Colors.white, color: Color(0xff2B353E),
onPressed: () { onPressed: () {
Navigator.push( Navigator.push(
context, context,
@ -70,72 +75,92 @@ class _H2OPageState extends State<H2OPage> with SingleTickerProviderStateMixin {
), ),
); );
}, },
) ),
: Container(),
], ],
body: Scaffold( body: Scaffold(
extendBodyBehindAppBar: true, // extendBodyBehindAppBar: true,
appBar: PreferredSize( // appBar: PreferredSize(
preferredSize: Size.fromHeight(65.0), // preferredSize: Size.fromHeight(65.0),
child: Stack( // child: Stack(
// children: <Widget>[
// Positioned(
// bottom: 1,
// left: 0,
// right: 0,
// child: BackdropFilter(
// filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
// child: Container(
// color: Theme.of(context).scaffoldBackgroundColor.withOpacity(0.8),
// height: 70.0,
// ),
// ),
// ),
// Center(
// child: Container(
// height: 60.0,
// alignment: Alignment.center,
// // margin: EdgeInsets.only(top: 10.0),
// // width: MediaQuery.of(context).size.width * 0.9,
//
// child: TabBar(
// isScrollable: false,
// controller: _tabController,
// indicatorWeight: 5.0,
// indicatorSize: TabBarIndicatorSize.tab,
// indicatorColor: Colors.red[800],
// labelColor: Theme.of(context).primaryColor,
// labelPadding: EdgeInsets.only(top: 4.0, left: 10.0, right: 13.0),
// unselectedLabelColor: Colors.grey[800],
// tabs: [
// Container(
// width: MediaQuery.of(context).size.width * 0.28,
// child: Center(
// child: Texts(TranslationBase.of(context).today),
// ),
// ),
// Container(
// width: MediaQuery.of(context).size.width * 0.28,
// child: Center(
// child: Texts(TranslationBase.of(context).week),
// ),
// ),
// Container(
// width: MediaQuery.of(context).size.width * 0.28,
// child: Center(
// child: Texts(TranslationBase.of(context).month),
// ),
// ),
// ],
// ),
// ),
// ),
// ],
// ),
// ),
// backgroundColor: Colors.white,
body: Column(
children: <Widget>[ children: <Widget>[
Positioned( TabBar(
bottom: 1,
left: 0,
right: 0,
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
child: Container(
color: Theme.of(context).scaffoldBackgroundColor.withOpacity(0.8),
height: 70.0,
),
),
),
Center(
child: Container(
height: 60.0,
alignment: Alignment.center,
// margin: EdgeInsets.only(top: 10.0),
// width: MediaQuery.of(context).size.width * 0.9,
child: TabBar(
isScrollable: false,
controller: _tabController, controller: _tabController,
indicatorWeight: 5.0, indicatorWeight: 3.0,
indicatorSize: TabBarIndicatorSize.tab, indicatorSize: TabBarIndicatorSize.tab,
indicatorColor: Colors.red[800], labelColor: Color(0xff2B353E),
labelColor: Theme.of(context).primaryColor, unselectedLabelColor: Color(0xff575757),
labelPadding: EdgeInsets.only(top: 4.0, left: 10.0, right: 13.0), labelPadding: EdgeInsets.only(top: 15, bottom: 13, left: 20, right: 20),
unselectedLabelColor: Colors.grey[800], labelStyle: TextStyle(
tabs: [ fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins',
Container( fontSize: 16,
width: MediaQuery.of(context).size.width * 0.28, fontWeight: FontWeight.w600,
child: Center( letterSpacing: -0.48,
child: Texts(TranslationBase.of(context).today), ),
), unselectedLabelStyle: TextStyle(
), fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins',
Container( fontSize: 16,
width: MediaQuery.of(context).size.width * 0.28, fontWeight: FontWeight.w600,
child: Center( letterSpacing: -0.48,
child: Texts(TranslationBase.of(context).week), ),
tabs: [Text(TranslationBase.of(context).today), Text(TranslationBase.of(context).week), Text(TranslationBase.of(context).month.toLowerCase().capitalizeFirstofEach)],
), ),
),
Container(
width: MediaQuery.of(context).size.width * 0.28,
child: Center(
child: Texts(TranslationBase.of(context).month),
),
),
],
),
),
),
],
),
),
backgroundColor: Colors.white,
body: Column(
children: <Widget>[
Expanded( Expanded(
child: TabBarView( child: TabBarView(
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),

7
lib/pages/AlHabibMedicalService/h2o/today_page.dart
Unescape Escape View File

@ -25,11 +25,11 @@ class TodayPage extends StatelessWidget {
appBarTitle: TranslationBase.of(context).h2o, appBarTitle: TranslationBase.of(context).h2o,
baseViewModel: model, baseViewModel: model,
body: SingleChildScrollView( body: SingleChildScrollView(
padding: EdgeInsets.symmetric(vertical: 12), padding: EdgeInsets.all(21),
child: Container(
margin: EdgeInsets.only(top: 60),
child: Column( child: Column(
children: [ children: [
Center( Center(
child: CircularPercentIndicator( child: CircularPercentIndicator(
radius: 180.0, radius: 180.0,
@ -165,7 +165,6 @@ class TodayPage extends StatelessWidget {
], ],
), ),
), ),
),
floatingActionButton: H20FloatingActionButton( floatingActionButton: H20FloatingActionButton(
// controller: _controller, // controller: _controller,
model: model, model: model,

2
lib/pages/BookAppointment/widgets/DoctorView.dart
Unescape Escape View File

@ -74,7 +74,7 @@ class DoctorView extends StatelessWidget {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
if (doctor.clinicName != null) myRichText(TranslationBase.of(context).clinic + ":", doctor.clinicName, projectViewModel.isArabic), if (doctor.clinicName != null) myRichText(TranslationBase.of(context).clinic + ":", doctor.clinicName, projectViewModel.isArabic),
if (doctor.projectName != null) myRichText(TranslationBase.of(context).hospital + ":", doctor.projectName, projectViewModel.isArabic), if (doctor.projectName != null) myRichText(TranslationBase.of(context).branch, doctor.projectName, projectViewModel.isArabic),
if (doctor.speciality != null) if (doctor.speciality != null)
Text( Text(
getDoctorSpeciality(this.doctor.speciality).trim(), getDoctorSpeciality(this.doctor.speciality).trim(),

3
lib/pages/medical/prescriptions/prescriptions_page.dart
Unescape Escape View File

@ -45,6 +45,8 @@ class PrescriptionsPage extends StatelessWidget {
padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21), padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21),
itemBuilder: (context, _index) { itemBuilder: (context, _index) {
Prescriptions prescriptions = prescriptionsList[_index]; Prescriptions prescriptions = prescriptionsList[_index];
bool _isSortByClinic = filterType == FilterType.Clinic;
return DoctorCard( return DoctorCard(
onTap: () async { onTap: () async {
final _shouldRecallApi = await Navigator.push( final _shouldRecallApi = await Navigator.push(
@ -63,6 +65,7 @@ class PrescriptionsPage extends StatelessWidget {
profileUrl: prescriptions.doctorImageURL, profileUrl: prescriptions.doctorImageURL,
rating: prescriptions.actualDoctorRate.toDouble(), rating: prescriptions.actualDoctorRate.toDouble(),
subName: prescriptions.name, subName: prescriptions.name,
isSortByClinic: _isSortByClinic,
isInOutPatient: prescriptions.isInOutPatient, isInOutPatient: prescriptions.isInOutPatient,
isLiveCareAppointment: prescriptions.isLiveCareAppointment, isLiveCareAppointment: prescriptions.isLiveCareAppointment,
// appointmentTime: DateUtil.formatDateToTime(DateUtil.convertStringToDate(prescriptions // appointmentTime: DateUtil.formatDateToTime(DateUtil.convertStringToDate(prescriptions

2
lib/uitl/translations_delegate_base.dart
Unescape Escape View File

@ -86,6 +86,8 @@ class TranslationBase {
String get gender => localizedValues['gender'][locale.languageCode]; String get gender => localizedValues['gender'][locale.languageCode];
String get pleaseSelectGender => localizedValues['please_select_gender'][locale.languageCode];
String get nationality => localizedValues['nationality'][locale.languageCode]; String get nationality => localizedValues['nationality'][locale.languageCode];
String get docQualifications => localizedValues['docQualifications'][locale.languageCode]; String get docQualifications => localizedValues['docQualifications'][locale.languageCode];

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

@ -164,7 +164,7 @@ class DoctorCard extends StatelessWidget {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
myRichText(isSortByClinic ? TranslationBase.of(context).hospital : TranslationBase.of(context).clinic + ":", subName, projectViewModel.isArabic), myRichText(isSortByClinic ? TranslationBase.of(context).branch : TranslationBase.of(context).clinic + ":", subName, projectViewModel.isArabic),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [

11
lib/widgets/others/app_scaffold_widget.dart
Unescape Escape View File

@ -114,7 +114,7 @@ class AppScaffold extends StatelessWidget {
dropdownIndexValue: dropdownIndexValue, dropdownIndexValue: dropdownIndexValue,
dropDownList: dropDownList ?? [], dropDownList: dropDownList ?? [],
dropDownIndexChange: dropDownIndexChange, dropDownIndexChange: dropDownIndexChange,
) appBarIcons: appBarIcons)
: (isShowAppBar : (isShowAppBar
? appBar = AppBarWidget( ? appBar = AppBarWidget(
appBarTitle: appBarTitle, appBarTitle: appBarTitle,
@ -166,7 +166,9 @@ class NewAppBarWidget extends StatelessWidget with PreferredSizeWidget {
final int dropdownIndexValue; final int dropdownIndexValue;
List<String> dropDownList; List<String> dropDownList;
final Function(int) dropDownIndexChange; final Function(int) dropDownIndexChange;
NewAppBarWidget({Key key, this.showTitle = false, this.showDropDown = false, this.title = "", this.dropDownList, this.dropdownIndexValue, this.dropDownIndexChange}) : super(key: key); final List<Widget> appBarIcons;
NewAppBarWidget({Key key, this.showTitle = false, this.showDropDown = false, this.title = "", this.dropDownList, this.appBarIcons, this.dropdownIndexValue, this.dropDownIndexChange})
: super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -224,9 +226,12 @@ class NewAppBarWidget extends StatelessWidget with PreferredSizeWidget {
), ),
), ),
), ),
) ),
], ],
), ),
actions: <Widget>[
if (appBarIcons != null) ...appBarIcons,
],
); );
} }

Write Preview
Loading…
Cancel
Save