Fix the form in prescription screen

merge-requests/967/head
RoaaGhali98 4 years ago
parent 17998cbbf3
commit 994b43a590

@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:doctor_app_flutter/util/tab_helper.dart';
import 'all_doctor_questions.dart';
import 'not_replaied_Doctor_Questions.dart';
@ -72,7 +72,7 @@ class _DoctorReplyScreenState extends State<DoctorReplyScreen>
preferredSize: Size.fromHeight(
MediaQuery.of(context).size.height * 0.070),
child: Container(
color: Helpers.getBgTabColor(),
color: TabHelper.getBgTabColor(),
child: TabBar(
isScrollable: false,
controller: _tabController,
@ -136,8 +136,8 @@ Widget tabWidget(
return Center(
child: Container(
height: Helpers.getTabHeight(context),
decoration: Helpers.getBoxTabsBoxDecoration(
height: TabHelper.getTabHeight(context),
decoration: TabHelper.getBoxTabsBoxDecoration(
isActive: isActive,
isFirst: isFirst,
isMiddle: isMiddle,
@ -146,9 +146,9 @@ Widget tabWidget(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Helpers.getTabText(title: title, isActive: isActive),
TabHelper.getTabText(title: title, isActive: isActive),
if (counter != -1)
Helpers.getTabCounter(isActive: isActive, counter: counter)
TabHelper.getTabCounter(isActive: isActive, counter: counter)
],
),
),

@ -14,6 +14,7 @@ import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../../util/tab_helper.dart';
import '../DischargedPatientPage.dart';
import 'in_patient_list_page.dart';
@ -123,7 +124,7 @@ class _InPatientScreenState extends State<InPatientScreen>
color: Colors.white),
child: Container(
margin: EdgeInsets.only(top: 9),
color: Helpers.getBgTabColor(),
color: TabHelper.getBgTabColor(),
child: TabBar(
isScrollable: false,
controller: _tabController,
@ -214,8 +215,8 @@ class _InPatientScreenState extends State<InPatientScreen>
return Center(
child: Container(
height: Helpers.getTabHeight(context),
decoration: Helpers.getBoxTabsBoxDecoration(
height: TabHelper.getTabHeight(context),
decoration: TabHelper.getBoxTabsBoxDecoration(
isActive: isActive,
isFirst: isFirst,
isMiddle: isMiddle,
@ -224,9 +225,9 @@ class _InPatientScreenState extends State<InPatientScreen>
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Helpers.getTabText(title: title, isActive: isActive),
TabHelper.getTabText(title: title, isActive: isActive),
if (counter != -1)
Helpers.getTabCounter(isActive: isActive, counter: counter)
TabHelper.getTabCounter(isActive: isActive, counter: counter)
],
),
),

@ -21,6 +21,7 @@ import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:provider/provider.dart';
import '../../../util/tab_helper.dart';
import 'filter_date_page.dart';
// ignore: must_be_immutable
@ -102,8 +103,8 @@ class _OutPatientsScreenState extends State<OutPatientsScreen> {
children: [
Container(
// color: Colors.red,
height: Helpers.getTabHeight(context),
color: Helpers.getBgTabColor(),
height: TabHelper.getTabHeight(context),
color: TabHelper.getBgTabColor(),
child: Row(
mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.center,
@ -138,7 +139,7 @@ class _OutPatientsScreenState extends State<OutPatientsScreen> {
child: Center(
child: Container(
height: screenSize.height * 0.070,
decoration: Helpers.getBoxTabsBoxDecoration(
decoration: TabHelper.getBoxTabsBoxDecoration(
isActive: _isActive,
isFirst: _times.indexOf(item) == 0,
isLast:
@ -150,12 +151,12 @@ class _OutPatientsScreenState extends State<OutPatientsScreen> {
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Helpers.getTabText(
TabHelper.getTabText(
title: item, isActive: _isActive),
_isActive &&
_activeLocation != 0 &&
model.state == ViewState.Idle
? Helpers.getTabCounter(
? TabHelper.getTabCounter(
isActive: _isActive,
counter: model.filterData.length)
: Container(),

@ -10,6 +10,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../../../util/tab_helper.dart';
import '../../ReferralDischargedPatientPage.dart';
import 'my-referral-inpatient-screen.dart';
@ -60,8 +61,8 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
Size.fromHeight(MediaQuery.of(context).size.height * 0.070),
child: Center(
child: Container(
height: Helpers.getTabHeight(context),
color: Helpers.getBgTabColor(),
height: TabHelper.getTabHeight(context),
color: TabHelper.getBgTabColor(),
child: Center(
child: TabBar(
isScrollable: false,
@ -75,36 +76,36 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
unselectedLabelColor: Colors.grey[800],
tabs: [
Container(
decoration: Helpers.getBoxTabsBoxDecoration(
decoration: TabHelper.getBoxTabsBoxDecoration(
isActive: index == 0,
isFirst: true,
projectViewModel: projectsProvider),
child: Center(
child: Helpers.getTabText(
child: TabHelper.getTabText(
title: TranslationBase.of(context)
.myReferredPatient,
isActive: index == 0)),
),
Center(
child: Container(
decoration: Helpers.getBoxTabsBoxDecoration(
decoration: TabHelper.getBoxTabsBoxDecoration(
isActive: index == 1,
isMiddle: true,
projectViewModel: projectsProvider),
child: Center(
child: Helpers.getTabText(
child: TabHelper.getTabText(
title: TranslationBase.of(context).referral,
isActive: index == 1)),
),
),
Center(
child: Container(
decoration: Helpers.getBoxTabsBoxDecoration(
decoration: TabHelper.getBoxTabsBoxDecoration(
isActive: index == 2,
isLast: true,
projectViewModel: projectsProvider),
child: Center(
child: Helpers.getTabText(
child: TabHelper.getTabText(
title: TranslationBase.of(context).discharged,
isActive: index == 2),
),

@ -405,16 +405,22 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
AppText(
_selectedMedication?.description ??
"",
bold: true,
fontWeight: FontWeight.w600,
),
SizedBox(
height: 15.0,
),
Container(
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(width: 6,),
AppText(
TranslationBase.of(context)
.orderType,
fontWeight: FontWeight.w600,
fontWeight: FontWeight.w500,
),
SizedBox(width: 18,),
Radio(
activeColor:
Color(0xFFB9382C),
@ -429,8 +435,6 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
],
),
),
SizedBox(
height: spaceBetweenTextFileds),
Container(
width: double.infinity,
child: Row(
@ -441,7 +445,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
.width *
0.35,
child: AppTextFieldCustom(
//height: 40,
height: 38,
validationError:
strengthError,
hintText: 'Strength',
@ -480,7 +484,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
element: model
.itemMedicineListUnit
.length ==
1
1
? model
.itemMedicineListUnit[0]
: units,

@ -327,107 +327,7 @@ class Helpers {
return kpi;
}
static getBoxTabsBoxDecoration(
{bool isFirst = false,
bool isMiddle = false,
bool isLast = false,
bool isActive = false,
double radius = 6.0,
ProjectViewModel projectViewModel}) {
return BoxDecoration(
color: isActive ? AppGlobal.appRedColor : Color(0xFFEAEAEA),
shape: BoxShape.rectangle,
borderRadius: BorderRadius.only(
topRight: projectViewModel.isArabic
? Radius.circular(isActive
? isLast || isMiddle
? radius
: 0
: 0)
: Radius.circular(isActive
? isFirst || isMiddle
? radius
: 0
: 0),
topLeft: projectViewModel.isArabic
? Radius.circular(isActive
? isFirst || isMiddle
? radius
: 0
: 0)
: Radius.circular(isActive
? isLast || isMiddle
? radius
: 0
: 0),
bottomRight: projectViewModel.isArabic
? Radius.circular(isActive
? isLast || isMiddle
? radius
: 0
: 0)
: Radius.circular(isActive
? isFirst || isMiddle
? radius
: 0
: 0),
bottomLeft: projectViewModel.isArabic
? Radius.circular(isActive
? isFirst || isMiddle
? radius
: 0
: 0)
: Radius.circular(isActive
? isLast || isMiddle
? radius
: 0
: 0)),
);
}
static getBgTabColor() {
return Color(0xFFEAEAEA);
}
static getTabText({
String title,
bool isActive = false,
}) {
return AppText(
title,
fontSize: SizeConfig.textMultiplier * 1.8,
color: isActive ? Colors.white : AppGlobal.appTextColor,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
);
}
static getTabHeight(BuildContext context) {
final screenSize = MediaQuery.of(context).size;
return screenSize.height * 0.07;
}
static getTabCounter({bool isActive: false, int counter}) {
return Container(
margin: EdgeInsets.all(4),
width: 15,
height: 15,
decoration: BoxDecoration(
color: isActive ? Colors.white : AppGlobal.appRedColor,
shape: BoxShape.circle,
),
child: Center(
child: FittedBox(
child: AppText(
"$counter",
fontSize: SizeConfig.textMultiplier * 1.5,
color: !isActive ? Colors.white : AppGlobal.appRedColor,
fontWeight: FontWeight.w700,
),
),
),
);
}
static String convertToTitleCase(String text) {
if (text == null) {

@ -0,0 +1,113 @@
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import '../config/config.dart';
import '../config/size_config.dart';
import '../core/viewModel/project_view_model.dart';
import '../widgets/shared/app_texts_widget.dart';
class TabHelper {
static getBoxTabsBoxDecoration(
{bool isFirst = false,
bool isMiddle = false,
bool isLast = false,
bool isActive = false,
double radius = 6.0,
ProjectViewModel projectViewModel}) {
return BoxDecoration(
color: isActive ? AppGlobal.appRedColor : Color(0xFFEAEAEA),
shape: BoxShape.rectangle,
borderRadius: BorderRadius.only(
topRight: projectViewModel.isArabic
? Radius.circular(isActive
? isLast || isMiddle
? radius
: 0
: 0)
: Radius.circular(isActive
? isFirst || isMiddle
? radius
: 0
: 0),
topLeft: projectViewModel.isArabic
? Radius.circular(isActive
? isFirst || isMiddle
? radius
: 0
: 0)
: Radius.circular(isActive
? isLast || isMiddle
? radius
: 0
: 0),
bottomRight: projectViewModel.isArabic
? Radius.circular(isActive
? isLast || isMiddle
? radius
: 0
: 0)
: Radius.circular(isActive
? isFirst || isMiddle
? radius
: 0
: 0),
bottomLeft: projectViewModel.isArabic
? Radius.circular(isActive
? isFirst || isMiddle
? radius
: 0
: 0)
: Radius.circular(isActive
? isLast || isMiddle
? radius
: 0
: 0)),
);
}
static getBgTabColor() {
return Color(0xFFEAEAEA);
}
static getTabText({
String title,
bool isActive = false,
}) {
return AppText(
title,
fontSize: SizeConfig.textMultiplier * 1.8,
color: isActive ? Colors.white : AppGlobal.appTextColor,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
);
}
static getTabHeight(BuildContext context) {
final screenSize = MediaQuery.of(context).size;
return screenSize.height * 0.07;
}
static getTabCounter({bool isActive: false, int counter}) {
return Container(
margin: EdgeInsets.all(4),
width: 15,
height: 15,
decoration: BoxDecoration(
color: isActive ? Colors.white : AppGlobal.appRedColor,
shape: BoxShape.circle,
),
child: Center(
child: FittedBox(
child: AppText(
"$counter",
fontSize: SizeConfig.textMultiplier * 1.5,
color: !isActive ? Colors.white : AppGlobal.appRedColor,
fontWeight: FontWeight.w700,
),
),
),
);
}
}

@ -104,7 +104,7 @@ class _ListSelectDialogState extends State<ListSelectDialog> {
.selectedValue[widget.attributeValueId]
.toString(),
value: item[widget.attributeValueId].toString(),
activeColor: Colors.blue.shade700,
activeColor: Color(0xFFB9382C),
selected: item[widget.attributeValueId]
.toString() ==
widget.selectedValue[widget.attributeValueId]

Loading…
Cancel
Save