Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bottom nav bar

Browse Source
merge-requests/255/head
Mohammad Aljammal 5 years ago
parent 9d8c1ddf63
commit 3e441c55b2
7 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File

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

@ -1646,4 +1646,8 @@ const Map localizedValues = {
"en": "Enter Diastolic Value",
"ar": "أدخل قيمة الإنبساط "
},
"cmc-heading": {
"en": "Comprehensive Medical Checkup",
"ar": "فحص طبي شامل"
},
};

9
lib/pages/landing/home_page.dart
Unescape Escape View File

@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/core/viewModels/dashboard_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/HomeHealthCare/home_health_care_index_page.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/HomeHealthCare/home_health_care_page.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/all_habib_medical_service_page.dart';
import 'package:diplomaticquarterapp/pages/ContactUs/contact_us_page.dart';
import 'package:diplomaticquarterapp/pages/Covid-DriveThru/covid-drivethru-location.dart';
@ -421,7 +422,7 @@ class _HomePageState extends State<HomePage> {
Navigator.push(
context,
FadePage(
page: HomeHealthCareIndexPage(),
page: HomeHealthCarePage(),
),
);
},
@ -436,10 +437,10 @@ class _HomePageState extends State<HomePage> {
height: 50,
),
SizedBox(
height: 3,
height: 10,
),
Texts(
TranslationBase.of(context).homeHealthCareService,
TranslationBase.of(context).cmcHeading,
textAlign: TextAlign.center,
color: Colors.white,
fontWeight: FontWeight.w700,
@ -505,7 +506,7 @@ class _HomePageState extends State<HomePage> {
height: 50,
),
SizedBox(
height: 3,
height:10,
),
Texts(
TranslationBase.of(context).emergencyService,

2
lib/pages/landing/landing_page.dart
Unescape Escape View File

@ -607,6 +607,8 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
return TranslationBase.of(context).medicalProfile;
case 2:
return TranslationBase.of(context).bookAppo;
case 5:
return TranslationBase.of(context).bookAppo;
case 3:
return TranslationBase.of(context).services;
case 4:

53
lib/pages/medical/medical_profile_page.dart
Unescape Escape View File

@ -54,15 +54,19 @@ class MedicalProfilePage extends StatefulWidget {
class _MedicalProfilePageState extends State<MedicalProfilePage> {
var authProvider = new AuthProvider();
List<Medical> medical=List();
List<Medical> medical = List();
ProjectViewModel projectViewModel;
@override
Widget build(BuildContext context) {
projectViewModel = Provider.of(context);
projectViewModel = Provider.of(context);
var appoCountProvider = Provider.of<ToDoCountProviderModel>(context);
List<Widget> myMedicalList = Utils.myMedicalList(projectViewModel: projectViewModel,context: context,count: appoCountProvider.count,isLogin: projectViewModel.isLogin);
return BaseView<MedicalViewModel>(
List<Widget> myMedicalList = Utils.myMedicalList(
projectViewModel: projectViewModel,
context: context,
count: appoCountProvider.count,
isLogin: projectViewModel.isLogin);
return BaseView<MedicalViewModel>(
onModelReady: (model) => model.getAppointmentHistory(),
builder: (_, model, widget) => AppScaffold(
isShowDecPage: false,
@ -97,25 +101,30 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
itemCount: model
.appoitmentAllHistoryResultList.length,
scrollDirection: Axis.horizontal,
reverse: !projectViewModel.isArabic,
reverse: projectViewModel.isArabic,
),
],
),
),
SizedBox(height: 50,),
SizedBox(
height: 50,
),
Padding(
padding: EdgeInsets.symmetric(vertical: 5.0),
child: GridView.builder(
shrinkWrap: true,
primary: false,
physics: NeverScrollableScrollPhysics(),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
gridDelegate:
SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 3,
childAspectRatio: MediaQuery.of(context).size.width / (MediaQuery.of(context).size.height / 2.40),
childAspectRatio: MediaQuery.of(context)
.size
.width /
(MediaQuery.of(context).size.height / 2.40),
),
itemCount: myMedicalList.length,
itemBuilder: (BuildContext context, int index) {
return myMedicalList[index];
},
),
@ -123,8 +132,7 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
],
),
SizedBox(
height:
MediaQuery.of(context).size.height * 0.12,
height: MediaQuery.of(context).size.height * 0.12,
),
if (model.user != null && model.isLogin)
Positioned(
@ -135,7 +143,7 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
width: double.infinity,
height: 80,
decoration: BoxDecoration(
color: Theme.of(context).primaryColor,
color: Colors.grey[500],
shape: BoxShape.rectangle,
border: Border.all(
color: Colors.transparent, width: 0.5),
@ -187,20 +195,13 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
),
);
}
fullMedicalData(){
if(projectViewModel.havePrivilege(5))
{}
}
}
class Medical{
final String title;
final String imagePath;
final String subTitle;
final Widget page;
Medical({this.title, this.imagePath, this.subTitle, this.page});
class Medical {
final String title;
final String imagePath;
final String subTitle;
final Widget page;
Medical({this.title, this.imagePath, this.subTitle, this.page});
}

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

@ -1377,15 +1377,10 @@ class TranslationBase {
localizedValues["viewTermsConditions"][locale.languageCode];
String get walkinAppo => localizedValues["WalkinAppo"][locale.languageCode];
String get videoAppo => localizedValues["videoAppo"][locale.languageCode];
String get addNewChild => localizedValues["add-new-child"][locale.languageCode];
String get sendChildEmailMsg => localizedValues["send-child-email-msg"][locale.languageCode];
String get vaccinationAddChildMsg => localizedValues["vaccination-add-child-msg"][locale.languageCode];
String get childAddedSuccessfully => localizedValues["child_added_successfully"][locale.languageCode];
String get bloodDEnterDesc => localizedValues["bloodD-enter-desc"][locale.languageCode];
String get viewTermsConditions => localizedValues["viewTermsConditions"][locale.languageCode];
String get weightAdd => localizedValues["weight-add"][locale.languageCode];
String get systolicAdd => localizedValues["systolic-add"][locale.languageCode];
String get diastolicAdd => localizedValues["systolic-add"][locale.languageCode];
String get cmcHeading => localizedValues["cmc-heading"][locale.languageCode];
}

2
lib/widgets/bottom_navigation/bottom_nav_bar.dart
Unescape Escape View File

@ -95,7 +95,7 @@ class _BottomNavBarState extends State<BottomNavBar> {
icon: EvaIcons.calendar,
activeIcon: EvaIcons.calendar,
changeIndex: _changeIndex,
index: _index,
index: widget.index,
currentIndex: 2,
name: TranslationBase.of(context).bookAppo,
),

14
lib/widgets/data_display/medical/time_line_widget.dart
Unescape Escape View File

@ -72,9 +72,8 @@ class TimeLineWidget extends StatelessWidget {
width: 15,
height: 15,
decoration: BoxDecoration(
color: Theme.of(context).primaryColor,
border: Border.all(
color: Theme.of(context).primaryColor, width: 2),
color: Colors.yellow[700],
border: Border.all(color: Colors.yellow[700], width: 2),
shape: BoxShape.rectangle,
borderRadius: BorderRadius.all(
Radius.circular(25.0),
@ -111,7 +110,7 @@ class TimeLineWidget extends StatelessWidget {
child: Column(
children: <Widget>[
Texts(
appoitmentAllHistoryResul.clinicName,
appoitmentAllHistoryResul.clinicName.trim(),
color: Colors.white,
fontSize: 12.5,
fontWeight: FontWeight.normal,
@ -132,9 +131,8 @@ class TimeLineWidget extends StatelessWidget {
width: 15,
height: 15,
decoration: BoxDecoration(
color: Theme.of(context).primaryColor,
border: Border.all(
color: Theme.of(context).primaryColor, width: 2),
color: Colors.yellow[700],
border: Border.all(color: Colors.yellow[700], width: 2),
shape: BoxShape.rectangle,
borderRadius: BorderRadius.all(
Radius.circular(25.0),
@ -164,7 +162,7 @@ class TimeLineWidget extends StatelessWidget {
height: 3,
),
Texts(
appoitmentAllHistoryResul.doctorNameObj,
appoitmentAllHistoryResul.doctorNameObj.trim(),
color: Colors.white,
fontSize: 10.5,
fontWeight: FontWeight.normal,

Write Preview
Loading…
Cancel
Save