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

Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan

Browse Source
merge-requests/464/head
Sultan Khan 4 years ago
parent d77bd19450 88d664776e
commit 44baa02cfc
17 changed files with 993 additions and 853 deletions
Show Stats Download Patch File Download Diff File

2
ios/Podfile.lock
Unescape Escape View File

@ -322,4 +322,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69
COCOAPODS: 1.10.1
COCOAPODS: 1.10.0.rc.1

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

@ -843,4 +843,11 @@ const Map<String, Map<String, String>> localizedValues = {
"en": "Step",
"ar": "خطوة"
},
"applyOrRescheduleLeave": {
"en": "Apply Or Reschedule Leave",
"ar": "التقدم بطلب أو إعادة جدولة الإجازة"
},"myQRCode": {
"en": "My QR Code",
"ar": "My QR Code"
},
};

139
lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
Unescape Escape View File

@ -1,6 +1,7 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/patient-ucaf-viewmodel.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/patients/profile/UCAF/page-stepper-widget.dart';
@ -145,8 +146,8 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
),
AppTextFieldCustom(
height: screenSize.height * 0.075,
hintText:
TranslationBase.of(context).durationOfIllness,
hintText: TranslationBase.of(context)
.durationOfIllness,
dropDownText: "3",
inputType: TextInputType.number,
inputFormatters: [
@ -163,6 +164,14 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
children: [
Row(
children: [
Icon(
DoctorApp.warning,
size: 20,
color: Color(0xFFCC9B14),
),
SizedBox(
width: 4,
),
AppText(
"BP (H/L)",
fontSize:
@ -246,7 +255,8 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
height: 16,
),
AppText(
TranslationBase.of(context).chiefComplaintsAndSymptoms,
TranslationBase.of(context)
.chiefComplaintsAndSymptoms,
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 2.1,
fontWeight: FontWeight.w700,
@ -265,7 +275,8 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
height: 8,
),
AppTextFieldCustom(
hintText: TranslationBase.of(context).instruction,
hintText:
TranslationBase.of(context).instruction,
dropDownText: helpers.parseHtmlString(model
.patientChiefComplaintList[0]
.chiefComplaint),
@ -288,7 +299,7 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
(index) => CheckboxListTile(
title: AppText(
conditionsData[index]['name'],
fontWeight: FontWeight.bold,
fontWeight: FontWeight.normal,
fontSize:
SizeConfig.textMultiplier * 2.1,
),
@ -307,115 +318,77 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
SizedBox(
height: 8,
),
Container(
height: screenSize.height * 0.070,
child: TextField(
decoration:
Helpers.textFieldSelectorDecoration(
TranslationBase.of(context).other,
null,
false),
enabled: true,
controller: _otherController,
keyboardType: TextInputType.text,
)),
AppTextFieldCustom(
height: screenSize.height * 0.075,
hintText: TranslationBase.of(context).other,
dropDownText: "None",
enabled: false,
),
SizedBox(
height: 8,
),
Container(
height: screenSize.height * 0.070,
child: TextField(
decoration:
Helpers.textFieldSelectorDecoration(
TranslationBase.of(context).how,
null,
false),
enabled: true,
controller: _howController,
keyboardType: TextInputType.text,
)),
AppTextFieldCustom(
height: screenSize.height * 0.075,
hintText: TranslationBase.of(context).how,
dropDownText: "None",
enabled: false,
),
SizedBox(
height: 8,
),
Row(
children: [
Expanded(
child: Container(
height: screenSize.height * 0.070,
child: TextField(
decoration: Helpers
.textFieldSelectorDecoration(
TranslationBase.of(context)
.when,
null,
false),
enabled: true,
controller: _whenController,
keyboardType: TextInputType.text,
)),
child: AppTextFieldCustom(
height: screenSize.height * 0.075,
hintText:
TranslationBase.of(context).when,
dropDownText: "None",
enabled: false,
),
),
SizedBox(
width: 4,
),
Expanded(
child: Container(
height: screenSize.height * 0.070,
child: TextField(
decoration: Helpers
.textFieldSelectorDecoration(
TranslationBase.of(context)
.where,
null,
false),
enabled: true,
controller: _whereController,
keyboardType: TextInputType.text,
)),
child: AppTextFieldCustom(
height: screenSize.height * 0.075,
hintText:
TranslationBase.of(context).where,
dropDownText: "None",
enabled: false,
),
),
],
),
SizedBox(
height: 8,
),
Container(
child: TextField(
decoration:
Helpers.textFieldSelectorDecoration(
TranslationBase.of(context)
.specifyPossibleLineManagement,
null,
false),
enabled: true,
controller: _managementsLineController,
keyboardType: TextInputType.text,
AppTextFieldCustom(
height: screenSize.height * 0.1,
hintText: TranslationBase.of(context).specifyPossibleLineManagement,
dropDownText: "None",
enabled: false,
minLines: 4,
maxLines: 6,
)),
),
SizedBox(
height: 16,
height: 26,
),
AppText(
TranslationBase.of(context).significantSigns,
fontWeight: FontWeight.bold,
fontSize: SizeConfig.textMultiplier * 2.0,
fontSize: SizeConfig.textMultiplier * 2.1,
),
SizedBox(
height: 8,
),
Container(
child: TextField(
decoration:
Helpers.textFieldSelectorDecoration(
TranslationBase.of(context)
.backAbdomen,
null,
false),
enabled: true,
controller: _signsController,
keyboardType: TextInputType.multiline,
minLines: null,
maxLines: null,
)),
AppTextFieldCustom(
height: screenSize.height * 0.1,
hintText: TranslationBase.of(context).backAbdomen,
dropDownText: "BackLNeck",
enabled: false,
),
],
),
),

37
lib/screens/patients/profile/patient_profile_screen.dart
Unescape Escape View File

@ -141,24 +141,29 @@ class PatientProfileScreen extends StatelessWidget {
if (patient.episodeNo != 0)
BorderedButton(
"${TranslationBase.of(context).update}\n${TranslationBase.of(context).episode}",
backgroundColor: Colors.red.shade700,
textColor: Colors.white,
vPadding: 8,
radius: 30,
hPadding: 20,
fontWeight: FontWeight.normal,
fontSize: 12,
fontFamily: 'Poppins',
icon: Image.asset(
"assets/images/modilfy-episode.png",
color: Colors.white,
height: 30,
backgroundColor:
patient.patientStatusType == 43
? Colors.red.shade700
: Colors.grey.shade700,
textColor: Colors.white,
vPadding: 8,
radius: 30,
hPadding: 20,
fontWeight: FontWeight.normal,
fontSize: 12,
fontFamily: 'Poppins',
icon: Image.asset(
"assets/images/modilfy-episode.png",
color: Colors.white,
height: 30,
),
handler: () {
Navigator.of(context).pushNamed(
UPDATE_EPISODE,
arguments: {'patient': patient});
},
if (patient.patientStatusType == 43) {
Navigator.of(context).pushNamed(
UPDATE_EPISODE,
arguments: {'patient': patient});
}
}
),
],
),

4
lib/screens/patients/profile/vital_sign/vital_sign_item.dart
Unescape Escape View File

@ -51,7 +51,7 @@ class VitalSignItem extends StatelessWidget {
"$lastVal",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.4,
fontWeight: FontWeight.w800,
fontWeight: FontWeight.bold,
margin: 0,
),
Expanded(
@ -88,7 +88,7 @@ class VitalSignItem extends StatelessWidget {
"$des",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.3,
fontWeight: FontWeight.w600,
fontWeight: FontWeight.bold,
),
),
),

1445
lib/screens/prescription/add_prescription_form.dart
View File

File diff suppressed because it is too large Load Diff

69
lib/screens/procedures/entity_list_checkbox_search_widget.dart
Unescape Escape View File

@ -133,47 +133,56 @@ class _EntityListCheckboxSearchWidgetState
child: Row(
children: [
AppText(
TranslationBase.of(context)
.orderType),
Radio(
activeColor: Color(0xFFB9382C),
value: 0,
groupValue: selectedType,
onChanged: (value) {
historyInfo.type =
setSelectedType(value)
.toString();
historyInfo.type =
value.toString();
},
TranslationBase.of(context)
.orderType,
fontWeight: FontWeight.w700,
),
Text('routine'),
Radio(
activeColor: Color(0xFFB9382C),
groupValue: selectedType,
value: 1,
onChanged: (value) {
historyInfo.type =
setSelectedType(value)
.toString();
Row(
children: [
Radio(
activeColor:
Color(0xFFB9382C),
value: 0,
groupValue: selectedType,
onChanged: (value) {
historyInfo.type =
setSelectedType(value)
.toString();
historyInfo.type =
value.toString();
},
),
Text('routine'),
Radio(
activeColor:
Color(0xFFB9382C),
groupValue: selectedType,
value: 1,
onChanged: (value) {
historyInfo.type =
setSelectedType(value)
.toString();
historyInfo.type =
value.toString();
},
historyInfo.type =
value.toString();
},
),
Text(TranslationBase.of(
context)
.urgent),
],
),
Text(TranslationBase.of(context)
.urgent),
],
),
),
),
SizedBox(
height: 15.0,
height: 2.0,
),
Padding(
padding: EdgeInsets.symmetric(
horizontal: 12),
horizontal: 12, vertical: 12.0),
child: TextFields(
hintText: TranslationBase.of(context)
.remarks,

5
lib/util/translations_delegate_base.dart
Unescape Escape View File

@ -622,6 +622,11 @@ class TranslationBase {
String get rescheduleLeaves =>
localizedValues['reschedule-leave'][locale.languageCode];
String get applyOrRescheduleLeave =>
localizedValues['applyOrRescheduleLeave'][locale.languageCode];
String get myQRCode =>
localizedValues['myQRCode'][locale.languageCode];
String get addMedication =>
localizedValues['addMedication'][locale.languageCode];

3
lib/widgets/doctor/my_schedule_widget.dart
Unescape Escape View File

@ -35,9 +35,6 @@ class MyScheduleWidget extends StatelessWidget {
fontFamily: 'Poppins',
// fontSize: 18
),
SizedBox(
height: 10,
),
AppText(
' ${workingHoursTable.date.day} ${(DateUtils.getMonth(workingHoursTable.date.month).toString().substring(0, 3))}',
fontSize: 18,

2
lib/widgets/patients/profile/soap_update/steps_widget.dart
Unescape Escape View File

@ -26,7 +26,7 @@ class StepsWidget extends StatelessWidget {
color: Colors.transparent,
child: Center(
child: Container(
width: MediaQuery.of(context).size.width * 0.87,
width: MediaQuery.of(context).size.width * 0.86,
child: Divider(
color: Colors.grey,
height: 0.75,

2
lib/widgets/patients/profile/soap_update/update_soap_index.dart
Unescape Escape View File

@ -95,7 +95,7 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndex>
child: StepsWidget(
index: _currentIndex,
changeCurrentTab: changePageViewIndex,
height: MediaQuery.of(context).size.height * 0.20,
height: 135,//MediaQuery.of(context).size.height * 0.17,
),
),
Container(

2
lib/widgets/shared/app-textfield-custom.dart
Unescape Escape View File

@ -68,7 +68,7 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
widget.hintText,
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.4,
fontWeight: FontWeight.w600,
fontWeight: FontWeight.w700,
),
widget.dropDownText == null
? TextField(

60
lib/widgets/shared/app_drawer_widget.dart
Unescape Escape View File

@ -45,18 +45,36 @@ class _AppDrawerState extends State<AppDrawer> {
flex: 4,
child: ListView(padding: EdgeInsets.zero, children: <Widget>[
Container(
margin: EdgeInsets.symmetric(horizontal: 20),
margin: EdgeInsets.symmetric(horizontal: 15),
// height: SizeConfig.heightMultiplier * 50,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
child: Image.asset(
'assets/images/dr_app_logo.png',
),
margin: EdgeInsets.only(top: 10, bottom: 10),
Row(
children: [
Container(
child: Image.asset(
'assets/images/dr_app_logo.png',
),
margin: EdgeInsets.only(top: 10, bottom: 10),
),
Container(
child: InkWell(
onTap: (){
Navigator.pop(context);
},
child: Icon(
DoctorApp.close_1,
size: 20,
),
),
margin: EdgeInsets.only(top: 20, bottom: 10),
)
],
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
),
SizedBox(height: 10),
SizedBox(height: 5),
if (authProvider.doctorProfile != null)
InkWell(
onTap: () {
@ -80,7 +98,7 @@ class _AppDrawerState extends State<AppDrawer> {
),
),
Padding(
padding: EdgeInsets.only(top: 5),
padding: EdgeInsets.only(top: 0),
child: AppText(
authProvider.doctorProfile?.clinicDescription,
fontWeight: FontWeight.w600,
@ -91,13 +109,10 @@ class _AppDrawerState extends State<AppDrawer> {
],
),
),
SizedBox(height: 10),
SizedBox(height: 40),
InkWell(
child: DrawerItem(
TranslationBase.of(context).rescheduleLeaves,
// " or " +
// TranslationBase.of(context).leaves,
TranslationBase.of(context).applyOrRescheduleLeave,
DoctorApp.reschedule__1,
// subTitle: ,
),
@ -111,19 +126,15 @@ class _AppDrawerState extends State<AppDrawer> {
));
},
),
SizedBox(height: 10),
SizedBox(height: 15),
InkWell(
child: DrawerItem(
'My QR Code',
// " or " +
// TranslationBase.of(context).leaves,
TranslationBase.of(context).myQRCode,
DoctorApp.qr_code_3,
// subTitle: ,
),
),
SizedBox(height: 15),
InkWell(
child: Container(
height: 80,
@ -138,14 +149,12 @@ class _AppDrawerState extends State<AppDrawer> {
),
),
SizedBox(
height: 40,
height: 130,
),
Container(
margin: EdgeInsets.symmetric(horizontal: 20),
child: Column(
children: [
InkWell(
child: DrawerItem(
projectsProvider.isArabic
@ -159,6 +168,7 @@ class _AppDrawerState extends State<AppDrawer> {
projectsProvider.changeLanguage('ar');
},
),
SizedBox(height: 10),
InkWell(
child: DrawerItem(
TranslationBase.of(context).logout, DoctorApp.logout_1),
@ -193,13 +203,13 @@ class _AppDrawerState extends State<AppDrawer> {
style: TextStyle(
color: Color(0xFF989898),
fontWeight: FontWeight.bold,
fontSize: SizeConfig.textMultiplier * 2,
fontSize: 14,
fontFamily: 'Poppins',),
children: <TextSpan>[
TextSpan(text: ' Cloud Solutions',
style: TextStyle(
color: Color(0xFF2E303A),
fontSize: SizeConfig.textMultiplier * 2,
fontSize: 15,
fontFamily: 'Poppins',),
)
]

12
lib/widgets/shared/bottom_nav_bar.dart
Unescape Escape View File

@ -37,23 +37,23 @@ class _BottomNavBarState extends State<BottomNavBar> {
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
BottomNavigationItem(
icon: DoctorApp.home_icon_active,
activeIcon: DoctorApp.home_active,
icon: DoctorApp.home_1,
activeIcon: DoctorApp.home_active_1,
changeIndex: _changeIndex,
index: _index,
currentIndex: 0,
name: TranslationBase.of(context).home,
),
BottomNavigationItem(
icon: DoctorApp.schedule_icon,
activeIcon: DoctorApp.scdedule_icon_active_1,
icon: DoctorApp.schedule_1,
activeIcon: DoctorApp.schedule_active_1,
changeIndex: _changeIndex,
index: _index,
currentIndex: 1,
name: TranslationBase.of(context).mySchedule,
),
BottomNavigationItem(
icon: DoctorApp.qr_code,
icon: DoctorApp.qr_reader,
activeIcon: DoctorApp.qr_reader_active_1,
changeIndex: _changeIndex,
index: _index,
@ -61,7 +61,7 @@ class _BottomNavBarState extends State<BottomNavBar> {
name: TranslationBase.of(context).qr,
),
BottomNavigationItem(
icon: DoctorApp.message_icon,
icon: DoctorApp.dr_reply_1,
activeIcon: DoctorApp.dr_reply_active_1,
changeIndex: _changeIndex,
index: _index,

15
lib/widgets/shared/bottom_navigation_item.dart
Unescape Escape View File

@ -34,19 +34,10 @@ class BottomNavigationItem extends StatelessWidget {
children: <Widget>[
SizedBox(height: 15,),
Container(
// decoration: BoxDecoration(boxShadow: [
// BoxShadow(
// color: currentIndex == index
// ? Color.fromRGBO(78, 62, 253, 0.4)
// : Color.fromRGBO(78, 62, 253, 0),
// blurRadius: 9.0,
// spreadRadius: -4.0,
// offset: Offset(0.0, 2.0))
// ]),
child: Icon(currentIndex == index ? activeIcon : icon,
/*color: currentIndex == index
? Theme.of(context).primaryColor
: Theme.of(context).dividerColor,*/
color: currentIndex == index
? Color(0xFF333C45)
: Theme.of(context).dividerColor,
size: 22.0),
),
SizedBox(height: 5,),

11
lib/widgets/shared/drawer_item_widget.dart
Unescape Escape View File

@ -26,7 +26,7 @@ class _DrawerItemState extends State<DrawerItem> {
@override
Widget build(BuildContext context) {
return Container(
margin: EdgeInsets.only(top: 5, bottom: 5, left: 0, right: 0),
margin: EdgeInsets.only(top: 0, bottom: 5, left: 0, right: 0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
@ -49,16 +49,9 @@ class _DrawerItemState extends State<DrawerItem> {
color:widget.color ??Color(0xFF2E303A),
fontSize: 14,
fontFamily: 'Poppins',
fontWeight: FontWeight.bold,
fontWeight: FontWeight.w600,
),
),
AppText(
widget.subTitle,
visibility: !widget.subTitle.isNullOrEmpty(),
color: widget.color ?? Colors.black,
marginLeft: 5,
fontSize: SizeConfig.textMultiplier * 2.5,
),
],
),
),

31
lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart
Unescape Escape View File

@ -137,14 +137,29 @@ class _MasterKeyCheckboxSearchAllergiesWidgetState
items[index]),
activeColor: Colors.red[800],
onChanged: (bool newValue) {
// setState(() {
// if (widget
// .isServiceSelected(items[index])) {
// widget.removeHistory(items[index]);
// } else {
// widget.addHistory(items[index]);
// }
// });
setState(() {
if (widget
.isServiceSelected(
items[index])) {
widget.removeAllergy(
items[index]);
} else {
// TODO add Allergy
MySelectedAllergy
mySelectedAllergy =
new MySelectedAllergy(
selectedAllergy:
items[index],
selectedAllergySeverity:
_selectedAllergySeverity,
remark: null,
isChecked: true,
isExpanded: true);
widget.addAllergy(
mySelectedAllergy);
}
});
}),
InkWell(
onTap: () {

Write Preview
Loading…
Cancel
Save