Merge branch 'prescription_changes' into 'development'

hot fix

See merge request Cloud_Solution/doctor_app_flutter!652
merge-requests/653/merge
Mohammad Aljammal 5 years ago
commit 8daf3d2abf

@ -337,7 +337,7 @@ const TRANSACTION_NO = 0;
const LANGUAGE_ID = 2;
const STAMP = '2020-04-27T12:17:17.721Z';
const IP_ADDRESS = '9.9.9.9';
const VERSION_ID = 5.9;
const VERSION_ID = 6.0;
const CHANNEL = 9;
const SESSION_ID = 'BlUSkYymTt';
const IS_LOGIN_FOR_DOCTOR_APP = true;

@ -22,6 +22,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app_text_form_field.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@ -439,20 +440,21 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
height: MediaQuery.of(context)
.size
.height *
0.06,
0.0749,
width: double.infinity,
child: Row(
children: [
Container(
height: MediaQuery.of(context)
.size
.height *
0.06,
// height: MediaQuery.of(context)
// .size
// .height *
// 0.02,
width: MediaQuery.of(context)
.size
.width *
0.35,
child: TextFields(
child: AppTextFieldCustom(
isPrscription: true,
inputFormatters: [
LengthLimitingTextInputFormatter(
5),
@ -463,15 +465,17 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
TranslationBase.of(
context)
.strength,
fontWeight: FontWeight.w500,
fontSize: 14.0,
borderWidth: 0.2,
// fontWeight: FontWeight.w500,
// fontSize: 14.0,
// borderWidth: 0.2,
controller:
strengthController,
keyboardType: TextInputType
.numberWithOptions(
decimal: true,
),
// keyboardType: TextInputType
// .numberWithOptions(
// decimal: true,
// ),
onChanged: (String value) {
setState(() {
strengthChar =
@ -486,30 +490,30 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
);
}
},
onSubmit: (_) {
if (_selectedMedication !=
null &&
duration != null &&
frequency != null &&
strengthController
.text !=
null) {
model.getBoxQuantity(
freq: frequency[
'parameterCode'],
duration:
duration['id'],
itemCode:
_selectedMedication
.itemId,
strength: double.parse(
strengthController
.text));
box = model.boxQuintity;
return;
}
},
// onClick: (_) {
// if (_selectedMedication !=
// null &&
// duration != null &&
// frequency != null &&
// strengthController
// .text !=
// null) {
// model.getBoxQuantity(
// freq: frequency[
// 'parameterCode'],
// duration:
// duration['id'],
// itemCode:
// _selectedMedication
// .itemId,
// strength: double.parse(
// strengthController
// .text));
// box = model.boxQuintity;
//
// return;
// }
// },
// validator: (value) {
// if (value.isEmpty &&
// strengthController.text.length >
@ -522,13 +526,13 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
),
),
SizedBox(
width: 10.0,
width: 5.0,
),
Container(
height: MediaQuery.of(context)
.size
.height *
0.06,
// height: MediaQuery.of(context)
// .size
// .height *
// 0.06,
color: Colors.white,
width: MediaQuery.of(context)
.size

@ -25,6 +25,7 @@ class AppTextFieldCustom extends StatefulWidget {
final List<TextInputFormatter> inputFormatters;
final Function(String) onChanged;
final String validationError;
final bool isPrscription;
AppTextFieldCustom({
this.height = 0,
@ -43,6 +44,7 @@ class AppTextFieldCustom extends StatefulWidget {
this.inputFormatters,
this.onChanged,
this.validationError,
this.isPrscription = false,
});
@override
@ -57,7 +59,9 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
return Column(
children: [
Container(
height: widget.height != 0 && widget.maxLines == 1 ? widget.height + 8 : null,
height: widget.height != 0 && widget.maxLines == 1
? widget.height + 8
: null,
decoration: widget.hasBorder
? TextFieldsUtils.containerBorderDecoration(
Color(0Xffffffff),
@ -87,18 +91,23 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
AppText(
widget.hintText,
color: Color(0xFF2E303A),
fontSize: SizeConfig.textMultiplier * 1.4,
fontSize: widget.isPrscription == false
? SizeConfig.textMultiplier * 1.3
: 0,
fontWeight: FontWeight.w700,
),
widget.dropDownText == null
? Container(
height: widget.height != 0 && widget.maxLines == 1 ? widget.height - 22 : null,
child: TextField(
height:
widget.height != 0 && widget.maxLines == 1
? widget.height - 22
: null,
child: TextField(
textAlign: projectViewModel.isArabic
? TextAlign.right
: TextAlign.left,
decoration:
TextFieldsUtils.textFieldSelectorDecoration(
decoration: TextFieldsUtils
.textFieldSelectorDecoration(
widget.hintText, null, true),
style: TextStyle(
fontSize: SizeConfig.textMultiplier * 1.7,
@ -106,13 +115,17 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
color: Color(0xFF575757),
),
controller: widget.controller,
keyboardType: widget.inputType?? (widget.maxLines == 1 ? TextInputType.text : TextInputType.multiline),
keyboardType: widget.inputType ??
(widget.maxLines == 1
? TextInputType.text
: TextInputType.multiline),
enabled: widget.enabled,
minLines: widget.minLines,
maxLines: widget.maxLines,
inputFormatters: widget.inputFormatters != null
? widget.inputFormatters
: [],
inputFormatters:
widget.inputFormatters != null
? widget.inputFormatters
: [],
onChanged: (value) {
setState(() {});
if (widget.onChanged != null) {
@ -120,7 +133,7 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
}
},
),
)
)
: AppText(
widget.dropDownText,
fontFamily: 'Poppins',

Loading…
Cancel
Save