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

hot fix

Browse Source
merge-requests/652/head
hussam al-habibeh 4 years ago
parent ed8da38bc9
commit 68e9470273
3 changed files with 64 additions and 53 deletions
Show Stats Download Patch File Download Diff File

2
lib/config/config.dart
Unescape Escape View File

@ -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;

86
lib/screens/prescription/add_prescription_form.dart
Unescape Escape View File

@ -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,20 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
height: MediaQuery.of(context)
.size
.height *
0.06,
0.075,
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(
inputFormatters: [
LengthLimitingTextInputFormatter(
5),
@ -463,15 +464,16 @@ 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 +488,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 +524,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

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

@ -57,7 +57,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),
@ -92,13 +94,16 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
),
widget.dropDownText == null
? Container(
height: widget.height != 0 && widget.maxLines == 1 ? widget.height - 22 : null,
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,11 +111,15 @@ 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
inputFormatters:
widget.inputFormatters != null
? widget.inputFormatters
: [],
onChanged: (value) {

Write Preview
Loading…
Cancel
Save