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

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

@ -36,9 +36,11 @@ class _PendingDischargeSummaryState extends State<PendingDischargeSummary> {
baseViewModel: model,
isShowAppBar: false,
body: model.pendingDischargeSummaryList.isEmpty
? ErrorMessage(
error: TranslationBase.of(context)
.noDataAvailable) // DrAppEmbeddedError(error: TranslationBase.of(context).noItem)
? Center(
child: ErrorMessage(
error: TranslationBase.of(context)
.noDataAvailable),
) // DrAppEmbeddedError(error: TranslationBase.of(context).noItem)
: Column(
children: [
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/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/error_message.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@ -54,7 +55,8 @@ class _ProgressNoteState extends State<NursingProgressNoteScreen> {
GetNursingProgressNoteRequestModel(
admissionNo: int.parse(patient.admissionNo),
patientTypeID: patient.patientType,
patientID: patient.patientId, setupID: "010266");
patientID: patient.patientId,
setupID: "010266");
model.getNursingProgressNote(getNursingProgressNoteRequestModel);
}
@ -78,8 +80,11 @@ class _ProgressNoteState extends State<NursingProgressNoteScreen> {
),
body: model.patientNursingProgressNoteList == null ||
model.patientNursingProgressNoteList.length == 0
? DrAppEmbeddedError(
error: TranslationBase.of(context).errorNoProgressNote)
? Center(
child: ErrorMessage(
error: TranslationBase.of(context).noDataAvailable,
),
)
: Container(
color: Colors.grey[200],
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/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/error_message.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@ -70,9 +71,10 @@ class _ProgressNoteState extends State<OperationReportScreen> {
children: <Widget>[
model.reservationList == null ||
model.reservationList.length == 0
? DrAppEmbeddedError(
error: TranslationBase.of(context).errorNoProgressNote)
: Expanded(
? Center(
child: ErrorMessage(
error: TranslationBase.of(context).noDataAvailable, ),
): Expanded(
child: Container(
child: ListView.builder(
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/shared/app_scaffold_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/error_message.dart';
import 'package:flutter/material.dart';
class PendingOrdersScreen extends StatelessWidget {
@ -34,8 +36,10 @@ class PendingOrdersScreen extends StatelessWidget {
appBarTitle: "Pending Orders",
body: model.pendingOrdersList == null ||
model.pendingOrdersList.length == 0
? DrAppEmbeddedError(
error: TranslationBase.of(context).noDataAvailable)
? Center(
child: ErrorMessage(
error: TranslationBase.of(context).noDataAvailable, ),
)
: Column(
children: [
Padding(
@ -64,30 +68,35 @@ class PendingOrdersScreen extends StatelessWidget {
],
),
),
Container(
Expanded(
child: Container(
height: MediaQuery.of(context).size.height *.9,
child: ListView.builder(
scrollDirection: Axis.vertical,
shrinkWrap: true,
itemCount: model.pendingOrdersList.length,
itemCount:
model.pendingOrdersList.length,
itemBuilder: (BuildContext ctxt, int index) {
return Padding(
padding: EdgeInsets.all(8.0),
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
border: Border.all(
color: Color(0xFF707070), width: 0.30),
),
child: Padding(
padding: EdgeInsets.all(8.0),
child: AppText(
model.pendingOrdersList[index].notes),
return FractionallySizedBox(
widthFactor: 0.95,
child: CardWithBgWidget(
hasBorder: false,
bgColor: Colors.transparent,
widget: Column(
children: [
Padding(
padding: EdgeInsets.all(8.0),
child: AppText(
model.pendingOrdersList[index].notes),
),
SizedBox(
height: 20,
),
],
),
),
);
})),
}),
),
),
],
),
),

Loading…
Cancel
Save