Merge branch 'flutter_vervion_2_by_elham' into 'flutter_2_developemt'

4 step from fix screen

See merge request Cloud_Solution/doctor_app_flutter!891
merge-requests/892/merge
Elham Ali 4 years ago
commit 43c670e5b1

@ -68,9 +68,9 @@ class PatientMedicalReportViewModel extends BaseViewModel {
}
}
Future updateMedicalReport(PatiantInformtion patient, String htmlText, int limitNumber, String invoiceNumber) async {
Future updateMedicalReport(PatiantInformtion patient, String htmlText, int? limitNumber, String? invoiceNumber) async {
setState(ViewState.Busy);
await _service.updateMedicalReport(patient, htmlText, limitNumber, invoiceNumber);
await _service.updateMedicalReport(patient, htmlText, limitNumber!, invoiceNumber!);
if (_service.hasError) {
error = _service.error!;
await getMedicalReportList(patient);

@ -189,19 +189,20 @@ class _EndCallScreenState extends State<EndCallScreen> {
.of(context)
.scaffoldBackgroundColor,
isShowAppBar: true,
appBar: PatientProfileAppBar(patientProfileAppBarModel :PatientProfileAppBarModel(patient: patient!,isInpatient: isInpatient,
isDischargedPatient: isDischargedPatient,
height: (patient!.patientStatusType != null && patient!.patientStatusType == 43)
? 210
: isDischargedPatient
? 240
: 0,
),
appBar: PatientProfileAppBar(
patient,
onPressed: (){
Navigator.pop(context);
},
),
isInpatient: isInpatient,
height: (patient!.patientStatusType != null &&
patient!.patientStatusType == 43)
? 210
: isDischargedPatient
? 240
: 0,
isDischargedPatient: isDischargedPatient),
body: Container(
height: !isSearchAndOut
? isDischargedPatient

@ -10,10 +10,9 @@ import 'package:flutter/material.dart';
import 'discharge_Summary_widget.dart';
class AllDischargeSummary extends StatefulWidget {
final Function changeCurrentTab;
final PatiantInformtion patient;
const AllDischargeSummary({this.changeCurrentTab, this.patient});
const AllDischargeSummary({ required this.patient});
@override
_AllDischargeSummaryState createState() => _AllDischargeSummaryState();
@ -27,7 +26,7 @@ class _AllDischargeSummaryState extends State<AllDischargeSummary> {
onModelReady: (model) {
model.getAllDischargeSummary(
patientId: widget.patient.patientId,
admissionNo: int.parse(widget.patient.admissionNo),
admissionNo: int.parse(widget.patient.admissionNo!),
);
},
builder: (_, model, w) => AppScaffold(
@ -36,7 +35,7 @@ class _AllDischargeSummaryState extends State<AllDischargeSummary> {
body: // DrAppEmbeddedError(error: TranslationBase.of(context).noItem)
model.allDisChargeSummaryList.isEmpty
? ErrorMessage(
error: TranslationBase.of(context).noDataAvailable)
error: TranslationBase.of(context).noDataAvailable!)
: Column(
children: [
Padding(

@ -17,7 +17,7 @@ class DischargeSummaryWidget extends StatefulWidget {
final GetDischargeSummaryResModel dischargeSummary;
bool isShowMore = false;
DischargeSummaryWidget({Key? key, this.dischargeSummary});
DischargeSummaryWidget({Key? key, required this.dischargeSummary});
@override
_DischargeSummaryWidgetState createState() => _DischargeSummaryWidgetState();
@ -40,7 +40,7 @@ class _DischargeSummaryWidgetState extends State<DischargeSummaryWidget> {
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
border: Border.all(color: Colors.grey[200], width: 0.5),
border: Border.all(color: Colors.grey[200]!, width: 0.5),
),
child: Padding(
padding: EdgeInsets.all(15.0),
@ -52,26 +52,26 @@ class _DischargeSummaryWidgetState extends State<DischargeSummaryWidget> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
CustomRow(
label: TranslationBase.of(context).doctorName + ": ",
label: TranslationBase.of(context).doctorName! + ": ",
value:
widget.dischargeSummary.createdByName.toString() ??
"".toString(),
isCopyable: false,
),
CustomRow(
label: TranslationBase.of(context).branch + ": ",
label: TranslationBase.of(context).branch! + ": ",
value: widget.dischargeSummary.projectName.toString() ??
"".toString(),
isCopyable: false,
),
CustomRow(
label: TranslationBase.of(context).clinicName + ": ",
label: TranslationBase.of(context).clinicName! + ": ",
value: widget.dischargeSummary.clinicName.toString() ??
"".toString(),
isCopyable: false,
),
CustomRow(
label: TranslationBase.of(context).dischargeDate + ": ",
label: TranslationBase.of(context).dischargeDate! + ": ",
value: AppDateUtils.getDateTimeFromServerFormat(
widget.dischargeSummary.createdOn)
.day

@ -12,9 +12,8 @@ import 'all_discharge_summary.dart';
import 'pending_discharge_summary.dart';
class DischargeSummaryPage extends StatefulWidget {
final Function changeCurrentTab;
const DischargeSummaryPage({Key? key, this.changeCurrentTab})
const DischargeSummaryPage({Key? key, })
: super(key: key);
@override
@ -23,7 +22,7 @@ class DischargeSummaryPage extends StatefulWidget {
class _DoctorReplyScreenState extends State<DischargeSummaryPage>
with SingleTickerProviderStateMixin {
TabController _tabController;
late TabController _tabController;
int _activeTab = 0;
int pageIndex = 1;
@ -54,11 +53,10 @@ class _DoctorReplyScreenState extends State<DischargeSummaryPage>
return WillPopScope(
onWillPop: () async {
widget.changeCurrentTab();
return false;
},
child: AppScaffold(
appBarTitle: TranslationBase.of(context).replay2,
appBarTitle: TranslationBase.of(context).replay2!,
isShowAppBar: true,
// appBarTitle: TranslationBase.of(context).progressNote,
appBar: PatientProfileAppBar(
@ -103,7 +101,7 @@ class _DoctorReplyScreenState extends State<DischargeSummaryPage>
tabWidget(
screenSize,
_activeTab == 1,
TranslationBase.of(context).all,
TranslationBase.of(context).all!,
),
],
),

@ -9,10 +9,9 @@ import 'package:flutter/material.dart';
import 'discharge_Summary_widget.dart';
class PendingDischargeSummary extends StatefulWidget {
final Function changeCurrentTab;
final PatiantInformtion patient;
const PendingDischargeSummary({Key? key, this.changeCurrentTab, this.patient})
const PendingDischargeSummary({Key? key, required this.patient})
: super(key: key);
@override
@ -29,7 +28,7 @@ class _PendingDischargeSummaryState extends State<PendingDischargeSummary> {
onModelReady: (model) {
model.getPendingDischargeSummary(
patientId: widget.patient.patientId,
admissionNo: int.parse(widget.patient.admissionNo),
admissionNo: int.parse(widget.patient.admissionNo!),
);
},
builder: (_, model, w) => AppScaffold(
@ -38,7 +37,7 @@ class _PendingDischargeSummaryState extends State<PendingDischargeSummary> {
body: model.pendingDischargeSummaryList.isEmpty
? ErrorMessage(
error: TranslationBase.of(context)
.noDataAvailable) // DrAppEmbeddedError(error: TranslationBase.of(context).noItem!)
.noDataAvailable!) // DrAppEmbeddedError(error: TranslationBase.of(context).noItem!)
: Column(
children: [
Padding(

@ -20,7 +20,7 @@ class FlowChartPage extends StatelessWidget {
final bool isInpatient;
FlowChartPage(
{this.patientLabOrder, this.filterName, this.patient, this.isInpatient});
{required this.patientLabOrder, required this.filterName, required this.patient, required this.isInpatient});
@override
Widget build(BuildContext context) {

@ -14,7 +14,7 @@ class LabResultHistoryPage extends StatelessWidget {
final String filterName;
final PatiantInformtion patient;
LabResultHistoryPage({this.patientLabOrder, this.filterName, this.patient});
LabResultHistoryPage({required this.patientLabOrder, required this.filterName, required this.patient});
// TODO mosa UI changes
@override
Widget build(BuildContext context) {

@ -220,7 +220,7 @@ class LabResultWidget extends StatelessWidget {
FadePage(
page: FlowChartPage(
filterName:
patientLabResultList[index].description,
patientLabResultList[index].description!,
patientLabOrder: patientLabOrder,
patient: patient,
isInpatient: isInpatient,

@ -12,7 +12,7 @@ class LabResultHistoryDetailsWidget extends StatefulWidget {
final List<LabResultHistory> labResultHistory;
LabResultHistoryDetailsWidget({
this.labResultHistory,
required this.labResultHistory,
});
@override
@ -72,7 +72,7 @@ class _VitalSignDetailsWidgetState extends State<LabResultHistoryDetailsWidget>
),
Table(
border: TableBorder.symmetric(
inside: BorderSide(width: 1.0, color: Colors.grey[300]),
inside: BorderSide(width: 1.0, color: Colors.grey[300]!),
),
children: fullData(projectViewModel),
),

@ -9,14 +9,14 @@ class LineChartCurvedLabHistory extends StatefulWidget {
final String title;
final List<LabResultHistory> labResultHistory;
LineChartCurvedLabHistory({this.title, this.labResultHistory});
LineChartCurvedLabHistory({required this.title, required this.labResultHistory});
@override
State<StatefulWidget> createState() => LineChartCurvedLabHistoryState();
}
class LineChartCurvedLabHistoryState extends State<LineChartCurvedLabHistory> {
bool isShowingMainData;
late bool isShowingMainData;
List<int> xAxixs = [];
int indexes = 0;

@ -21,12 +21,12 @@ class AllLabSpecialResult extends StatefulWidget {
}
class _AllLabSpecialResultState extends State<AllLabSpecialResult> {
String patientType;
late String patientType;
String arrivalType;
PatiantInformtion patient;
bool isInpatient;
bool isFromLiveCare;
late String arrivalType;
late PatiantInformtion patient;
late bool isInpatient;
late bool isFromLiveCare;
@override
void didChangeDependencies() {
@ -46,7 +46,7 @@ class _AllLabSpecialResultState extends State<AllLabSpecialResult> {
ProjectViewModel projectViewModel = Provider.of(context);
return BaseView<LabsViewModel>(
onModelReady: (model) =>
model.getAllSpecialLabResult(patientId: patient.patientMRN),
model.getAllSpecialLabResult(patientId: patient!.patientMRN!),
builder: (context, LabsViewModel model, widget) => AppScaffold(
baseViewModel: model,
backgroundColor: Colors.grey[100],
@ -71,9 +71,9 @@ class _AllLabSpecialResultState extends State<AllLabSpecialResult> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).special +
TranslationBase.of(context).special! +
" " +
TranslationBase.of(context).lab,
TranslationBase.of(context).lab!,
style: "caption2",
color: Colors.black,
fontSize: 13,
@ -137,15 +137,15 @@ class _AllLabSpecialResultState extends State<AllLabSpecialResult> {
model.allSpecialLabList[index]
.isLiveCareAppointment
? TranslationBase.of(context)
.liveCare
.liveCare!
.toUpperCase()
: !model.allSpecialLabList[index]
.isInOutPatient
? TranslationBase.of(context)
.inPatientLabel
.inPatientLabel!
.toUpperCase()
: TranslationBase.of(context)
.outpatient
.outpatient!
.toUpperCase(),
style: TextStyle(color: Colors.white),
),

@ -9,9 +9,9 @@ import 'LineChartCurvedLabHistory.dart';
class LabResultHistoryChartAndDetails extends StatelessWidget {
LabResultHistoryChartAndDetails({
Key key,
@required this.labResultHistory,
@required this.name,
Key? key,
required this.labResultHistory,
required this.name,
}) : super(key: key);
final List<LabResultHistory> labResultHistory;

@ -151,7 +151,7 @@ class _LaboratoryResultWidgetState extends State<LaboratoryResultWidget> {
else if (widget.details == null)
Container(
child: ErrorMessage(
error: TranslationBase.of(context).noDataAvailable,
error: TranslationBase.of(context).noDataAvailable!,
),
),
SizedBox(

@ -13,7 +13,7 @@ class SpecialLabResultDetailsPage extends StatelessWidget {
final String resultData;
final PatiantInformtion patient;
const SpecialLabResultDetailsPage({Key? key, this.resultData, this.patient}) : super(key: key);
const SpecialLabResultDetailsPage({Key? key, required this.resultData, required this.patient}) : super(key: key);
@override
Widget build(BuildContext context) {

@ -15,20 +15,20 @@ import 'package:permission_handler/permission_handler.dart';
class AddVerifyMedicalReport extends StatefulWidget {
final PatiantInformtion patient;
final String patientType;
final String arrivalType;
final MedicalReportModel medicalReport;
final String?patientType;
final String? arrivalType;
final MedicalReportModel? medicalReport;
final PatientMedicalReportViewModel model;
final MedicalReportStatus status;
final String medicalNote;
final MedicalReportStatus? status;
final String? medicalNote;
const AddVerifyMedicalReport(
{Key? key,
this.patient,
required this.patient,
this.patientType,
this.arrivalType,
this.medicalReport,
this.model,
required this.model,
this.status,
this.medicalNote})
: super(key: key);
@ -71,11 +71,11 @@ class _AddVerifyMedicalReportState extends State<AddVerifyMedicalReport> {
HtmlRichEditor(
initialText: (widget.medicalReport != null
? widget.medicalNote
: widget.model.medicalReportTemplate[0].templateText.length > 0
: widget.model.medicalReportTemplate[0].templateText!.length > 0
? widget.model.medicalReportTemplate[0].templateText
: ""),
hint: "Write the medical report ",
height: MediaQuery.of(context).size.height * 0.75,
height: MediaQuery.of(context).size.height * 0.75, controller: _controller,
),
],
),
@ -101,7 +101,7 @@ class _AddVerifyMedicalReportState extends State<AddVerifyMedicalReport> {
// disabled: progressNoteController.text.isEmpty,
fontWeight: FontWeight.w700,
onPressed: () async {
txtOfMedicalReport = await HtmlEditor.getText();
txtOfMedicalReport = await _controller.getText();
if (txtOfMedicalReport.isNotEmpty) {
GifLoaderDialogUtils.showMyDialog(context);
@ -109,8 +109,8 @@ class _AddVerifyMedicalReportState extends State<AddVerifyMedicalReport> {
?await widget.model.updateMedicalReport(
widget.patient,
txtOfMedicalReport,
widget.medicalReport != null ? widget.medicalReport.lineItemNo : null,
widget.medicalReport != null ? widget.medicalReport.invoiceNo : null)
widget.medicalReport != null ? widget.medicalReport!.lineItemNo : null,
widget.medicalReport != null ? widget.medicalReport!.invoiceNo : null)
: await widget.model.addMedicalReport(widget.patient, txtOfMedicalReport);
//model.getMedicalReportList(patient);
@ -138,10 +138,10 @@ class _AddVerifyMedicalReportState extends State<AddVerifyMedicalReport> {
color: Color(0xff359846),
fontWeight: FontWeight.w700,
onPressed: () async {
txtOfMedicalReport = await HtmlEditor.getText();
txtOfMedicalReport = await _controller.getText();
if (txtOfMedicalReport.isNotEmpty) {
GifLoaderDialogUtils.showMyDialog(context);
await widget.model.verifyMedicalReport(widget.patient, widget.medicalReport);
await widget.model.verifyMedicalReport(widget.patient, widget.medicalReport!);
GifLoaderDialogUtils.hideDialog(context);
Navigator.pop(context);
if (widget.model.state == ViewState.ErrorLocal) {

@ -87,7 +87,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
body: model.patientProgressNoteList == null ||
model.patientProgressNoteList.length == 0
? DrAppEmbeddedError(
error: TranslationBase.of(context).errorNoProgressNote)
error: TranslationBase.of(context).errorNoProgressNote!)
: Container(
color: Colors.grey[200],
child: Column(
@ -113,8 +113,8 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
);
},
label: widget.visitType == 3
? TranslationBase.of(context).addNewOrderSheet
: TranslationBase.of(context).addProgressNote,
? TranslationBase.of(context).addNewOrderSheet!
: TranslationBase.of(context).addProgressNote!,
),
Expanded(
child: Container(
@ -129,7 +129,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
.status ==
1 &&
authenticationViewModel
.doctorProfile.doctorID !=
.doctorProfile!.doctorID !=
model
.patientProgressNoteList[
index]
@ -156,7 +156,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
.status ==
1 &&
authenticationViewModel
.doctorProfile.doctorID !=
.doctorProfile!.doctorID !=
model
.patientProgressNoteList[
index]
@ -201,7 +201,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
.status !=
4 &&
authenticationViewModel
.doctorProfile.doctorID ==
.doctorProfile!.doctorID ==
model
.patientProgressNoteList[
index]

@ -37,11 +37,11 @@ class NursingProgressNoteScreen extends StatefulWidget {
}
class _ProgressNoteState extends State<NursingProgressNoteScreen> {
List<NoteModel> notesList;
late List<NoteModel> notesList;
var filteredNotesList;
bool isDischargedPatient = false;
AuthenticationViewModel authenticationViewModel;
ProjectViewModel projectViewModel;
late AuthenticationViewModel authenticationViewModel;
late ProjectViewModel projectViewModel;
getProgressNoteList(BuildContext context, PatientViewModel model,
{bool isLocalBusy = false}) async {
@ -52,8 +52,8 @@ class _ProgressNoteState extends State<NursingProgressNoteScreen> {
print(type);
GetNursingProgressNoteRequestModel getNursingProgressNoteRequestModel =
GetNursingProgressNoteRequestModel(
admissionNo: int.parse(patient.admissionNo),
patientTypeID: patient.patientType,
admissionNo: int.parse(patient!.admissionNo!),
patientTypeID: patient!.patientType!,
patientID: patient.patientId, setupID: "010266");
model.getNursingProgressNote(getNursingProgressNoteRequestModel);
}
@ -79,7 +79,7 @@ class _ProgressNoteState extends State<NursingProgressNoteScreen> {
body: model.patientNursingProgressNoteList == null ||
model.patientNursingProgressNoteList.length == 0
? DrAppEmbeddedError(
error: TranslationBase.of(context).errorNoProgressNote)
error: TranslationBase.of(context).errorNoProgressNote!)
: Container(
color: Colors.grey[200],
child: Column(

@ -31,7 +31,7 @@ import '../../../../widgets/shared/app_texts_widget.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
class OperationReportScreen extends StatefulWidget {
final int visitType;
final int? visitType;
const OperationReportScreen({Key? key, this.visitType}) : super(key: key);
@ -40,11 +40,11 @@ class OperationReportScreen extends StatefulWidget {
}
class _ProgressNoteState extends State<OperationReportScreen> {
List<NoteModel> notesList;
late List<NoteModel> notesList;
var filteredNotesList;
bool isDischargedPatient = false;
AuthenticationViewModel authenticationViewModel;
ProjectViewModel projectViewModel;
late AuthenticationViewModel authenticationViewModel;
late ProjectViewModel projectViewModel;
@override
Widget build(BuildContext context) {
@ -55,7 +55,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
if (routeArgs.containsKey('isDischargedPatient'))
isDischargedPatient = routeArgs['isDischargedPatient'];
return BaseView<OperationReportViewModel>(
onModelReady: (model) => model.getReservations(patient.patientMRN),
onModelReady: (model) => model.getReservations(patient!.patientMRN!),
builder: (_, model, w) => AppScaffold(
baseViewModel: model,
backgroundColor: Theme.of(context).scaffoldBackgroundColor,
@ -71,7 +71,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
model.reservationList == null ||
model.reservationList.length == 0
? DrAppEmbeddedError(
error: TranslationBase.of(context).errorNoProgressNote)
error: TranslationBase.of(context).errorNoProgressNote!)
: Expanded(
child: Container(
child: ListView.builder(

@ -36,16 +36,16 @@ class UpdateOperationReport extends StatefulWidget {
final GetReservationsResponseModel reservation;
// final OperationReportViewModel operationReportViewModel;
final PatiantInformtion patient;
final int visitType;
final int? visitType;
final bool isUpdate;
const UpdateOperationReport(
{Key? key,
// this.operationReportViewModel,
this.patient,
required this.patient,
this.visitType,
this.isUpdate,
this.reservation})
required this.isUpdate,
required this.reservation})
: super(key: key);
@override
@ -53,12 +53,12 @@ class UpdateOperationReport extends StatefulWidget {
}
class _UpdateOperationReportState extends State<UpdateOperationReport> {
int selectedType;
late int selectedType;
bool isSubmitted = false;
stt.SpeechToText speech = stt.SpeechToText();
var reconizedWord;
var event = RobotProvider();
ProjectViewModel projectViewModel;
late ProjectViewModel projectViewModel;
TextEditingController preOpDiagmosisController = TextEditingController();
TextEditingController postOpDiagmosisNoteController = TextEditingController();
@ -135,7 +135,7 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
baseViewModel: model,
backgroundColor: Theme.of(context).scaffoldBackgroundColor,
appBar: BottomSheetTitle(
title: TranslationBase.of(context).operationReports,
title: TranslationBase.of(context).operationReports!,
),
body: SingleChildScrollView(
child: Container(
@ -540,8 +540,8 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
child: AppButton(
title: (widget.isUpdate
? TranslationBase.of(context).noteUpdate
: TranslationBase.of(context).noteAdd) +
TranslationBase.of(context).operationReports,
: TranslationBase.of(context).noteAdd)! +
TranslationBase.of(context).operationReports!,
color: Color(0xff359846),
// disabled: operationReportsController.text.isEmpty,
fontWeight: FontWeight.w700,
@ -590,9 +590,9 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
bloodLossDetailController.text,
patientID: widget.patient.patientId,
admissionNo:
int.parse(widget.patient.admissionNo),
int.parse(widget.patient.admissionNo!),
createdBy: model
.doctorProfile.doctorID,
.doctorProfile!.doctorID!,
setupID: "010266");
await model
.updateOperationReport(

@ -9,11 +9,11 @@ import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.d
import 'package:flutter/material.dart';
class PendingOrdersScreen extends StatelessWidget {
const PendingOrdersScreen({Key? key}) : super(key: key);
const PendingOrdersScreen({Key key}) : super(key: key);
@override
Widget build(BuildContext context) {
final routeArgs = ModalRoute.of(context)!.settings.arguments as Map;
final routeArgs = ModalRoute.of(context).settings.arguments as Map;
PatiantInformtion patient = routeArgs['patient'];
patient = routeArgs['patient'];
String patientType = routeArgs['patientType'];
@ -24,73 +24,73 @@ class PendingOrdersScreen extends StatelessWidget {
admissionNo: int.parse(patient.admissionNo)),
builder:
(BuildContext context, PendingOrdersViewModel model, Widget child) =>
AppScaffold(
appBar: PatientProfileAppBar(
patient,
isInpatient: isInpatient,
),
isShowAppBar: true,
baseViewModel: model,
appBarTitle: "Pending Orders",
body: model.pendingOrdersList == null ||
AppScaffold(
appBar: PatientProfileAppBar(
patient,
isInpatient: isInpatient,
),
isShowAppBar: true,
baseViewModel: model,
appBarTitle: "Pending Orders",
body: model.pendingOrdersList == null ||
model.pendingOrdersList.length == 0
? DrAppEmbeddedError(
? DrAppEmbeddedError(
error: TranslationBase.of(context).noDataAvailable)
: Column(
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
Row(
children: [
AppText(
TranslationBase.of(context).pending,
fontSize: 15.0,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
),
],
),
Row(
children: [
AppText(
TranslationBase.of(context).orders,
fontSize: 25.0,
fontWeight: FontWeight.w700,
),
],
),
],
),
: Column(
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
Row(
children: [
AppText(
TranslationBase.of(context).pending,
fontSize: 15.0,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
),
],
),
Row(
children: [
AppText(
TranslationBase.of(context).orders,
fontSize: 25.0,
fontWeight: FontWeight.w700,
),
],
),
],
),
Container(
child: ListView.builder(
scrollDirection: Axis.vertical,
shrinkWrap: true,
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),
),
Container(
child: ListView.builder(
scrollDirection: Axis.vertical,
shrinkWrap: true,
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),
),
),
);
})),
],
),
),
);
}
}

@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
class CustomEditableText extends StatefulWidget {
CustomEditableText({
Key key,
@required this.controller,
required this.controller,
this.hint,
this.isEditable = false, this.isSubmitted,
}) : super(key: key);

@ -501,15 +501,15 @@ class _ActivationPageState extends State<ActivationPage> {
counterText: " ",
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(10)),
borderSide: BorderSide(color: Colors.grey[300]),
borderSide: BorderSide(color: Colors.grey[300]!),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(10.0)),
borderSide: BorderSide(color: Colors.grey[300]),
borderSide: BorderSide(color: Colors.grey[300]!),
),
errorBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(10.0)),
borderSide: BorderSide(color: Colors.grey[300]),
borderSide: BorderSide(color: Colors.grey[300]!),
),
focusedErrorBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(10.0)),

@ -21,7 +21,7 @@ class BaseAddProcedureTabPage extends StatefulWidget {
final ProcedureType? procedureType;
const BaseAddProcedureTabPage(
{Key? key, this.model, this.prescriptionModel, this.patient, @required this.procedureType})
{Key? key, this.model, this.prescriptionModel, this.patient, required this.procedureType})
: super(key: key);
@override

Loading…
Cancel
Save