small fixes

merge-requests/901/head
Elham Rababh 4 years ago
parent f99ce10edf
commit bfd86f533a

@ -10,6 +10,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -49,8 +50,11 @@ class _AdmissionOrdersScreenState extends State<AdmissionOrdersScreen> {
), ),
body: model.admissionOrderList == null || body: model.admissionOrderList == null ||
model.admissionOrderList.length == 0 model.admissionOrderList.length == 0
? DrAppEmbeddedError( ? Center(
error: TranslationBase.of(context).noDataAvailable) child: ErrorMessage(
error: TranslationBase.of(context).noDataAvailable,
),
)
: Container( : Container(
color: Colors.grey[200], color: Colors.grey[200],
child: Column( child: Column(

@ -199,7 +199,7 @@ class _DiabeticChartState extends State<DiabeticChart> {
], ],
), ),
) )
: ErrorMessage(error: TranslationBase.of(context).noItem), : Center(child: ErrorMessage(error: TranslationBase.of(context).noItem)),
], ],
), ),
)), )),

@ -23,6 +23,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@ -50,10 +51,11 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
print(type); print(type);
GetDiagnosisForInPatientRequestModel getDiagnosisForInPatientRequestModel = GetDiagnosisForInPatientRequestModel getDiagnosisForInPatientRequestModel =
GetDiagnosisForInPatientRequestModel( GetDiagnosisForInPatientRequestModel(
admissionNo: int.parse(patient.admissionNo), admissionNo: int.parse(patient.admissionNo),
patientTypeID: patient.patientType, patientTypeID: patient.patientType,
patientID: patient.patientId, setupID: "010266"); patientID: patient.patientId,
setupID: "010266");
model.getDiagnosisForInPatient(getDiagnosisForInPatientRequestModel); model.getDiagnosisForInPatient(getDiagnosisForInPatientRequestModel);
} }
@ -76,8 +78,11 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
), ),
body: model.diagnosisForInPatientList == null || body: model.diagnosisForInPatientList == null ||
model.diagnosisForInPatientList.length == 0 model.diagnosisForInPatientList.length == 0
? DrAppEmbeddedError( ? Center(
error: TranslationBase.of(context).noItem) child: ErrorMessage(
error: TranslationBase.of(context).noDataAvailable,
),
)
: Container( : Container(
color: Colors.grey[200], color: Colors.grey[200],
child: Column( child: Column(
@ -85,8 +90,7 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
Expanded( Expanded(
child: Container( child: Container(
child: ListView.builder( child: ListView.builder(
itemCount: itemCount: model.diagnosisForInPatientList.length,
model.diagnosisForInPatientList.length,
itemBuilder: (BuildContext ctxt, int index) { itemBuilder: (BuildContext ctxt, int index) {
return FractionallySizedBox( return FractionallySizedBox(
widthFactor: 0.95, widthFactor: 0.95,
@ -207,9 +211,9 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
MainAxisAlignment.start, MainAxisAlignment.start,
children: [ children: [
AppText( AppText(
TranslationBase.of( TranslationBase.of(context)
context) .icd +
.icd + " : ", " : ",
fontSize: 12, fontSize: 12,
), ),
Expanded( Expanded(
@ -228,16 +232,17 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
), ),
Row( Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.start, MainAxisAlignment.start,
children: [ children: [
AppText("Ascii Desc : ", AppText(
"Ascii Desc : ",
fontSize: 12, fontSize: 12,
), ),
Expanded( Expanded(
child: AppText( child: AppText(
model model
.diagnosisForInPatientList[ .diagnosisForInPatientList[
index] index]
.asciiDesc, .asciiDesc,
fontSize: 12, fontSize: 12,
isCopyable: true, isCopyable: true,

@ -35,8 +35,10 @@ class _AllDischargeSummaryState extends State<AllDischargeSummary> {
isShowAppBar: false, isShowAppBar: false,
body: // DrAppEmbeddedError(error: TranslationBase.of(context).noItem) body: // DrAppEmbeddedError(error: TranslationBase.of(context).noItem)
model.allDisChargeSummaryList.isEmpty model.allDisChargeSummaryList.isEmpty
? ErrorMessage( ? Center(
error: TranslationBase.of(context).noDataAvailable) child: ErrorMessage(
error: TranslationBase.of(context).noDataAvailable),
)
: Column( : Column(
children: [ children: [
Padding( Padding(

@ -36,9 +36,11 @@ class _PendingDischargeSummaryState extends State<PendingDischargeSummary> {
baseViewModel: model, baseViewModel: model,
isShowAppBar: false, isShowAppBar: false,
body: model.pendingDischargeSummaryList.isEmpty body: model.pendingDischargeSummaryList.isEmpty
? ErrorMessage( ? Center(
error: TranslationBase.of(context) child: ErrorMessage(
.noDataAvailable) // DrAppEmbeddedError(error: TranslationBase.of(context).noItem) error: TranslationBase.of(context)
.noDataAvailable),
) // DrAppEmbeddedError(error: TranslationBase.of(context).noItem)
: Column( : Column(
children: [ children: [
Padding( Padding(

@ -22,6 +22,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@ -54,7 +55,8 @@ class _ProgressNoteState extends State<NursingProgressNoteScreen> {
GetNursingProgressNoteRequestModel( GetNursingProgressNoteRequestModel(
admissionNo: int.parse(patient.admissionNo), admissionNo: int.parse(patient.admissionNo),
patientTypeID: patient.patientType, patientTypeID: patient.patientType,
patientID: patient.patientId, setupID: "010266"); patientID: patient.patientId,
setupID: "010266");
model.getNursingProgressNote(getNursingProgressNoteRequestModel); model.getNursingProgressNote(getNursingProgressNoteRequestModel);
} }
@ -78,8 +80,11 @@ class _ProgressNoteState extends State<NursingProgressNoteScreen> {
), ),
body: model.patientNursingProgressNoteList == null || body: model.patientNursingProgressNoteList == null ||
model.patientNursingProgressNoteList.length == 0 model.patientNursingProgressNoteList.length == 0
? DrAppEmbeddedError( ? Center(
error: TranslationBase.of(context).errorNoProgressNote) child: ErrorMessage(
error: TranslationBase.of(context).noDataAvailable,
),
)
: Container( : Container(
color: Colors.grey[200], color: Colors.grey[200],
child: Column( child: Column(

@ -17,6 +17,7 @@ import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-
import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@ -70,9 +71,10 @@ class _ProgressNoteState extends State<OperationReportScreen> {
children: <Widget>[ children: <Widget>[
model.reservationList == null || model.reservationList == null ||
model.reservationList.length == 0 model.reservationList.length == 0
? DrAppEmbeddedError( ? Center(
error: TranslationBase.of(context).errorNoProgressNote) child: ErrorMessage(
: Expanded( error: TranslationBase.of(context).noDataAvailable, ),
): Expanded(
child: Container( child: Container(
child: ListView.builder( child: ListView.builder(
itemCount: model.reservationList.length, itemCount: model.reservationList.length,

@ -5,7 +5,9 @@ import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class PendingOrdersScreen extends StatelessWidget { class PendingOrdersScreen extends StatelessWidget {
@ -34,8 +36,10 @@ class PendingOrdersScreen extends StatelessWidget {
appBarTitle: "Pending Orders", appBarTitle: "Pending Orders",
body: model.pendingOrdersList == null || body: model.pendingOrdersList == null ||
model.pendingOrdersList.length == 0 model.pendingOrdersList.length == 0
? DrAppEmbeddedError( ? Center(
error: TranslationBase.of(context).noDataAvailable) child: ErrorMessage(
error: TranslationBase.of(context).noDataAvailable, ),
)
: Column( : Column(
children: [ children: [
Padding( Padding(
@ -64,30 +68,35 @@ class PendingOrdersScreen extends StatelessWidget {
], ],
), ),
), ),
Container( Expanded(
child: Container(
height: MediaQuery.of(context).size.height *.9,
child: ListView.builder( child: ListView.builder(
scrollDirection: Axis.vertical, itemCount:
shrinkWrap: true, model.pendingOrdersList.length,
itemCount: model.pendingOrdersList.length,
itemBuilder: (BuildContext ctxt, int index) { itemBuilder: (BuildContext ctxt, int index) {
return Padding( return FractionallySizedBox(
padding: EdgeInsets.all(8.0), widthFactor: 0.95,
child: Container( child: CardWithBgWidget(
decoration: BoxDecoration( hasBorder: false,
borderRadius: BorderRadius.all( bgColor: Colors.transparent,
Radius.circular(10.0), widget: Column(
), children: [
border: Border.all( Padding(
color: Color(0xFF707070), width: 0.30), padding: EdgeInsets.all(8.0),
), child: AppText(
child: Padding( model.pendingOrdersList[index].notes),
padding: EdgeInsets.all(8.0), ),
child: AppText( SizedBox(
model.pendingOrdersList[index].notes), height: 20,
),
],
), ),
), ),
); );
})), }),
),
),
], ],
), ),
), ),

Loading…
Cancel
Save