Merge branch 'improve_code_stander' into 'development'

Improve code stander

See merge request Cloud_Solution/doctor_app_flutter!949
merge-requests/948/merge
Elham Ali 4 years ago
commit 0f71025e31

@ -88,6 +88,9 @@ class _AllLabSpecialResultState extends State<AllLabSpecialResult> {
], ],
), ),
), ),
if(model.allSpecialLabList.length == 0)
ErrorMessage(error: TranslationBase.of(context).noItem),
if(model.allSpecialLabList.length > 0)
ListView.builder( ListView.builder(
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
itemCount: model.allSpecialLabList.length, itemCount: model.allSpecialLabList.length,

@ -88,16 +88,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
patient, patient,
isInpatient: true, isInpatient: true,
), ),
body: model.patientProgressNoteList == null || body: Container(
model.patientProgressNoteList.length == 0
? widget.visitType == 3
? ErrorMessage(
error: TranslationBase.of(context).errorNoOrders,
)
: ErrorMessage(
error: TranslationBase.of(context).errorNoProgressNote,
)
: Container(
color: Colors.grey[200], color: Colors.grey[200],
child: Column( child: Column(
children: <Widget>[ children: <Widget>[

@ -54,12 +54,12 @@ class _AppButtonState extends State<AppButton> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (widget.fontSize == null) { if (widget.fontSize == null) {
widget.fontSize = SizeConfig.getHeightMultiplier() * widget.fontSize = SizeConfig.getHeightMultiplier() *
(SizeConfig.isHeightVeryShort ? 1.3 : 1.7); (SizeConfig.isHeightVeryShort ? 2.1 :SizeConfig.isHeightShort?1.8: 1.7);
} }
return Container( return Container(
// height: MediaQuery.of(context).size.height * 0.075, // height: MediaQuery.of(context).size.height * 0.075,
height: widget.height?? SizeConfig.heightMultiplier * height: widget.height?? SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 6 : 5), (SizeConfig.isHeightVeryShort ? 6 :SizeConfig.isHeightShort?5.5: 5),
child: IgnorePointer( child: IgnorePointer(
ignoring: widget.loading || widget.disabled, ignoring: widget.loading || widget.disabled,
child: RawMaterialButton( child: RawMaterialButton(

Loading…
Cancel
Save