some fixes to go flutter 2

merge-requests/888/head
Elham Rababh 4 years ago
parent eceb3976ad
commit 47437c8637

@ -14,7 +14,7 @@ import '../../base/base_service.dart';
class LabsService extends BaseService {
List<PatientLabOrders> patientLabOrdersList = [];
List<AllSpecialLabResultModel> _allSpecialLab = List();
List<AllSpecialLabResultModel> _allSpecialLab = [];
List<AllSpecialLabResultModel> get allSpecialLab => _allSpecialLab;
AllSpecialLabResultRequestModel _allSpecialLabResultRequestModel = AllSpecialLabResultRequestModel();
@ -56,7 +56,7 @@ class LabsService extends BaseService {
List<PatientLabSpecialResult> patientLabSpecialResult = [];
List<LabResult> labResultList = [];
List<LabOrderResult> labOrdersResultsList = [];
List<LabResultHistory> labOrdersResultHistoryList = List();
List<LabResultHistory> labOrdersResultHistoryList = [];
Future getLaboratoryResult(
{String? projectID,

@ -18,7 +18,7 @@ import '../../base/base_service.dart';
class PrescriptionsService extends BaseService {
List<Prescriptions> prescriptionsList = [];
List<GetMedicationForInPatientModel> medicationForInPatient = List();
List<GetMedicationForInPatientModel> medicationForInPatient = [];
List<PrescriptionsOrder> prescriptionsOrderList = [];
List<PrescriotionInPatient> prescriptionInPatientList = [];

@ -30,7 +30,7 @@ class SickLeaveService extends BaseService {
List<SickLeavePatientModel> getAllSickLeavePatient = [];
List<SickLeavePatientModel> getAllSickLeaveDoctor = List();
List<SickLeavePatientModel> getAllSickLeaveDoctor = [];
SickLeavePatientRequestModel _sickLeavePatientRequestModel = SickLeavePatientRequestModel();
GetSickLeaveDoctorRequestModel _sickLeaveDoctorRequestModel = GetSickLeaveDoctorRequestModel();

@ -6,10 +6,10 @@ import 'package:doctor_app_flutter/models/pending_orders/pending_order_request_m
import 'package:doctor_app_flutter/models/pending_orders/pending_orders_model.dart';
class PendingOrderService extends BaseService {
List<PendingOrderModel> _pendingOrderList = List();
List<PendingOrderModel> _pendingOrderList = [];
List<PendingOrderModel> get pendingOrderList => _pendingOrderList;
List<AdmissionOrdersModel> _admissionOrderList = List();
List<AdmissionOrdersModel> _admissionOrderList = [];
List<AdmissionOrdersModel> get admissionOrderList => _admissionOrderList;
Future getPendingOrders(

@ -145,7 +145,7 @@ class PatientSearchViewModel extends BaseViewModel {
List<PatiantInformtion> get myIinPatientList => _inPatientService.myInPatientList;
List<PatiantInformtion> filteredInPatientItems = [];
List<PatiantInformtion> filteredMyInPatientItems = List();
List<PatiantInformtion> filteredMyInPatientItems = [];
Future getInPatientList(PatientSearchRequestModel requestModel, {bool isMyInpatient = false, bool isLocalBusy = false}) async {
await getDoctorProfile();

@ -32,7 +32,7 @@ class PrescriptionsViewModel extends BaseViewModel {
List<GetMedicationForInPatientModel> get medicationForInPatient => _prescriptionsService.medicationForInPatient;
List<PrescriptionsList> _medicationForInPatient = List();
List<PrescriptionsList> _medicationForInPatient = [];
getPrescriptions(PatiantInformtion patient) async {
setState(ViewState.Busy);

@ -1,5 +1,4 @@
class ListGtMyPatientsQuestions {
import 'package:doctor_app_flutter/util/date-utils.dart';
Null rowID;
String? setupID;

@ -14,7 +14,7 @@ import 'doctor_repaly_chat.dart';
class AllDoctorQuestions extends StatefulWidget {
final Function changeCurrentTab;
const AllDoctorQuestions({Key key, this.changeCurrentTab}) : super(key: key);
const AllDoctorQuestions({Key? key, this.changeCurrentTab}) : super(key: key);
@override
_AllDoctorQuestionsState createState() => _AllDoctorQuestionsState();

@ -24,7 +24,7 @@ class DoctorReplayChat extends StatefulWidget {
final DoctorReplayViewModel previousModel;
bool showMsgBox = false;
DoctorReplayChat(
{Key key, this.reply, this.previousModel,
{Key? key, this.reply, this.previousModel,
});
@override

@ -28,7 +28,7 @@ import 'not_replaied_Doctor_Questions.dart';
class DoctorReplyScreen extends StatefulWidget {
final Function changeCurrentTab;
const DoctorReplyScreen({Key key, this.changeCurrentTab}) : super(key: key);
const DoctorReplyScreen({Key? key, this.changeCurrentTab}) : super(key: key);
@override
_DoctorReplyScreenState createState() => _DoctorReplyScreenState();

@ -14,7 +14,7 @@ import 'doctor_repaly_chat.dart';
class NotRepliedDoctorQuestions extends StatefulWidget {
final Function changeCurrentTab;
const NotRepliedDoctorQuestions({Key key, this.changeCurrentTab})
const NotRepliedDoctorQuestions({Key? key, this.changeCurrentTab})
: super(key: key);
@override

@ -25,7 +25,7 @@ class InPatientScreen extends StatefulWidget {
bool isAllClinic = true;
bool showBottomSheet = false;
String selectedClinicName;
InPatientScreen({Key key, this.specialClinic});
InPatientScreen({Key? key, this.specialClinic});
@override
_InPatientScreenState createState() => _InPatientScreenState();

@ -15,7 +15,7 @@ import 'UCAF-detail-screen.dart';
import 'UCAF-input-screen.dart';
class UCAFPagerScreen extends StatefulWidget {
const UCAFPagerScreen({Key key}) : super(key: key);
const UCAFPagerScreen({Key? key}) : super(key: key);
@override
_UCAFPagerScreenState createState() => _UCAFPagerScreenState();

@ -14,7 +14,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class AdmissionOrdersScreen extends StatefulWidget {
const AdmissionOrdersScreen({Key key}) : super(key: key);
const AdmissionOrdersScreen({Key? key}) : super(key: key);
@override
_AdmissionOrdersScreenState createState() => _AdmissionOrdersScreenState();

@ -13,7 +13,7 @@ class DiabeticDetails extends StatefulWidget {
final List<GetDiabeticChartValuesResponseModel> diabeticDetailsList;
DiabeticDetails(
{Key key, this.diabeticDetailsList,});
{Key? key, this.diabeticDetailsList,});
@override
_VitalSignDetailsWidgetState createState() => _VitalSignDetailsWidgetState();

@ -14,8 +14,8 @@ class LineChartForDiabetic extends StatelessWidget {
LineChartForDiabetic(
{this.title, this.timeSeries1, this.indexes, this.isOX= false});
List<int> xAxixs = List();
List<double> yAxixs = List();
List<int> xAxixs = [];
List<double> yAxixs = [];
@override
Widget build(BuildContext context) {
@ -188,12 +188,12 @@ class LineChartForDiabetic extends StatelessWidget {
}
List<LineChartBarData> getData(context) {
List<FlSpot> spots = List();
List<FlSpot> spots = [];
for (int index = 0; index < timeSeries1.length; index++) {
spots.add(FlSpot(index.toDouble(), timeSeries1[index].sales));
}
List<FlSpot> spots2 = List();
List<FlSpot> spots2 = [];
// for (int index = 0; index < timeSeries2.length; index++) {
// spots2.add(FlSpot(index.toDouble(), timeSeries2[index].sales));
// }
@ -225,7 +225,7 @@ class LineChartForDiabetic extends StatelessWidget {
),
);
List<LineChartBarData> lineChartData = List();
List<LineChartBarData> lineChartData = [];
if(spots.isNotEmpty){
lineChartData.add(lineChartBarData1);
}

@ -31,7 +31,7 @@ import 'package:provider/provider.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
class DiagnosisScreen extends StatefulWidget {
const DiagnosisScreen({Key key}) : super(key: key);
const DiagnosisScreen({Key? key}) : super(key: key);
@override
_ProgressNoteState createState() => _ProgressNoteState();

@ -16,7 +16,7 @@ import 'discharge_Summary_widget.dart';
class AllDischargeSummary extends StatefulWidget {
final Function changeCurrentTab;
const AllDischargeSummary({Key key, this.changeCurrentTab}) : super(key: key);
const AllDischargeSummary({Key? key, this.changeCurrentTab}) : super(key: key);
@override
_AllDischargeSummaryState createState() => _AllDischargeSummaryState();

@ -19,7 +19,7 @@ class DischargeSummaryWidget extends StatefulWidget {
final GetDischargeSummaryResModel dischargeSummary;
bool isShowMore = false;
DischargeSummaryWidget({Key key, this.dischargeSummary});
DischargeSummaryWidget({Key? key, this.dischargeSummary});
@override
_DischargeSummaryWidgetState createState() => _DischargeSummaryWidgetState();

@ -23,7 +23,7 @@ import 'pending_discharge_summary.dart';
class DischargeSummaryPage extends StatefulWidget {
final Function changeCurrentTab;
const DischargeSummaryPage({Key key, this.changeCurrentTab}) : super(key: key);
const DischargeSummaryPage({Key? key, this.changeCurrentTab}) : super(key: key);
@override
_DoctorReplyScreenState createState() => _DoctorReplyScreenState();

@ -17,7 +17,7 @@ class PendingDischargeSummary extends StatefulWidget {
final Function changeCurrentTab;
final PatiantInformtion patient;
const PendingDischargeSummary({Key key, this.changeCurrentTab, this.patient})
const PendingDischargeSummary({Key? key, this.changeCurrentTab, this.patient})
: super(key: key);
@override

@ -20,7 +20,7 @@ class FlowChartPage extends StatelessWidget {
final bool isInpatient;
FlowChartPage(
{required this.patientLabOrder, required this.filterName, required this.patient, required this.isInpatient});
{this.patientLabOrder, this.filterName, this.patient, this.isInpatient});
@override
Widget build(BuildContext context) {
@ -29,45 +29,47 @@ class FlowChartPage extends StatelessWidget {
patientLabOrder: patientLabOrder,
procedureDescription: filterName,
patient: patient),
//onModelReady: (model) =>
model.getPatientLabOrdersResults(//patientLabOrder: patientLabOrder,// procedure: filterName,// patient: patient),
// onModelReady: (model) => model.getPatientLabOrdersResults(
// patientLabOrder: patientLabOrder,
// procedure: filterName,
// patient: patient),
builder: (context, model, w) => AppScaffold(
isShowAppBar: true,
appBarTitle: filterName,
baseViewModel: model,
body: model.labOrdersResultHistoryList.isNotEmpty
? SingleChildScrollView(
child: Container(
child: LabResultHistoryChartAndDetails(
name: filterName,
labResultHistory: model.labOrdersResultHistoryList,
),
// child: LabResultChartAndDetails(
// name: filterName,
// labResult: model.labOrdersResultsList,
// ),
),
)
child: Container(
child: LabResultHistoryChartAndDetails(
name: filterName,
labResultHistory: model.labOrdersResultHistoryList,
),
// child: LabResultChartAndDetails(
// name: filterName,
// labResult: model.labOrdersResultsList,
// ),
),
)
: Container(
child: Center(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
children: [
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(
TranslationBase.of(context).noDataAvailable,
fontWeight: FontWeight.normal,
color: HexColor("#B8382B"),
fontSize: SizeConfig.textMultiplier * 2.5,
),
)
],
child: Center(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
children: [
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(
TranslationBase.of(context).noDataAvailable,
fontWeight: FontWeight.normal,
color: HexColor("#B8382B"),
fontSize: SizeConfig.textMultiplier * 2.5,
),
),
),
)
],
),
),
),
),
);
}

@ -17,7 +17,7 @@ class LineChartCurvedLabHistory extends StatefulWidget {
class LineChartCurvedLabHistoryState extends State<LineChartCurvedLabHistory> {
bool isShowingMainData;
List<int> xAxixs = List();
List<int> xAxixs = [];
int indexes = 0;
@override
@ -197,7 +197,7 @@ class LineChartCurvedLabHistoryState extends State<LineChartCurvedLabHistory> {
}
List<LineChartBarData> getData() {
List<FlSpot> spots = List();
List<FlSpot> spots = [];
for (int index = 0; index < widget.labResultHistory.length; index++) {
try {
var resultValueDouble =

@ -14,7 +14,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class AllLabSpecialResult extends StatefulWidget {
const AllLabSpecialResult({Key key}) : super(key: key);
const AllLabSpecialResult({Key? key}) : super(key: key);
@override
_AllLabSpecialResultState createState() => _AllLabSpecialResultState();

@ -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, this.resultData, this.patient}) : super(key: key);
@override
Widget build(BuildContext context) {

@ -23,7 +23,7 @@ class AddVerifyMedicalReport extends StatefulWidget {
final String medicalNote;
const AddVerifyMedicalReport(
{Key key,
{Key? key,
this.patient,
this.patientType,
this.arrivalType,

@ -30,7 +30,7 @@ import 'package:provider/provider.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
class NursingProgressNoteScreen extends StatefulWidget {
const NursingProgressNoteScreen({Key key}) : super(key: key);
const NursingProgressNoteScreen({Key? key}) : super(key: key);
@override
_ProgressNoteState createState() => _ProgressNoteState();

@ -33,7 +33,7 @@ DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
class OperationReportScreen extends StatefulWidget {
final int visitType;
const OperationReportScreen({Key key, this.visitType}) : super(key: key);
const OperationReportScreen({Key? key, this.visitType}) : super(key: key);
@override
_ProgressNoteState createState() => _ProgressNoteState();

@ -40,7 +40,7 @@ class UpdateOperationReport extends StatefulWidget {
final bool isUpdate;
const UpdateOperationReport(
{Key key,
{Key? key,
// this.operationReportViewModel,
this.patient,
this.visitType,

@ -9,7 +9,7 @@ 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) {

@ -18,7 +18,7 @@ import 'package:flutter/material.dart';
class MyReferralDetailScreen extends StatelessWidget {
final MyReferralPatientModel referralPatient;
const MyReferralDetailScreen({Key key, this.referralPatient}) : super(key: key);
const MyReferralDetailScreen({Key? key, this.referralPatient}) : super(key: key);
@override
Widget build(BuildContext context) {

@ -44,7 +44,7 @@ class UpdateAssessmentPage extends StatefulWidget {
class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
implements AssessmentCallBack {
bool isAssessmentExpand = false;
List<MySelectedAssessment> mySelectedAssessmentList = List();
List<MySelectedAssessment> mySelectedAssessmentList = [];
@override
Widget build(BuildContext context) {

@ -44,7 +44,7 @@ class UpdateObjectivePage extends StatefulWidget {
class _UpdateObjectivePageState extends State<UpdateObjectivePage>
implements ObjectiveCallBack {
bool isSysExaminationExpand = false;
List<MySelectedExamination> mySelectedExamination = List();
List<MySelectedExamination> mySelectedExamination = [];
BoxDecoration containerBorderDecoration(Color containerColor, Color borderColor) {
return BoxDecoration(

@ -9,7 +9,7 @@ class BottomSheetDialogButton extends StatelessWidget {
double headerHeight = SizeConfig.heightMultiplier * 12;
BottomSheetDialogButton({Key key, this.onTap, this.label}) : super(key: key);
BottomSheetDialogButton({Key? key, this.onTap, this.label}) : super(key: key);
@override
Widget build(BuildContext context) {

@ -10,7 +10,7 @@ class RemoveButton extends StatelessWidget {
final Function onTap;
final String label;
const RemoveButton({Key key, this.onTap, this.label}) : super(key: key);
const RemoveButton({Key? key, this.onTap, this.label}) : super(key: key);
@override
Widget build(BuildContext context) {

@ -16,7 +16,7 @@ class StepsWidget extends StatelessWidget {
final PatiantInformtion patientInfo;
StepsWidget(
{Key key,
{Key? key,
this.index,
this.changeCurrentTab,
this.height = 0.0,

@ -26,7 +26,7 @@ class AddAllergiesItem extends StatefulWidget {
final MasterKeyModel item;
const AddAllergiesItem(
{Key key,
{Key? key,
this.model,
this.removeAllergy,
this.addAllergy,

@ -24,7 +24,7 @@ class MasterKeyCheckboxSearchAllergiesWidget extends StatefulWidget {
final String hintSearchText;
MasterKeyCheckboxSearchAllergiesWidget(
{Key key,
{Key? key,
this.model,
this.addSelectedAllergy,
this.removeAllergy,
@ -43,7 +43,7 @@ class MasterKeyCheckboxSearchAllergiesWidget extends StatefulWidget {
class _MasterKeyCheckboxSearchAllergiesWidgetState
extends State<MasterKeyCheckboxSearchAllergiesWidget> {
List<MasterKeyModel> items = List();
List<MasterKeyModel> items = [];
TextEditingController filteredSearchController = TextEditingController();
@override
@ -122,10 +122,10 @@ class _MasterKeyCheckboxSearchAllergiesWidgetState
}
void filterSearchResults(String query) {
List<MasterKeyModel> dummySearchList = List();
List<MasterKeyModel> dummySearchList = [];
dummySearchList.addAll(widget.masterList);
if (query.isNotEmpty) {
List<MasterKeyModel> dummyListData = List();
List<MasterKeyModel> dummyListData = [];
dummySearchList.forEach((items) {
if (items.nameAr.toLowerCase().contains(query.toLowerCase()) ||
items.nameEn.toLowerCase().contains(query.toLowerCase())) {

@ -46,8 +46,8 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage>
TextEditingController medicationController = TextEditingController();
final formKey = GlobalKey<FormState>();
List<MySelectedAllergy> myAllergiesList = List();
List<MySelectedHistory> myHistoryList = List();
List<MySelectedAllergy> myAllergiesList = [];
List<MySelectedHistory> myHistoryList = [];
getHistory(SOAPViewModel model) async {
widget.changeLoadingState(true);

@ -31,8 +31,8 @@ class UpdateSoapIndex extends StatefulWidget {
class _UpdateSoapIndexState extends State<UpdateSoapIndex> with TickerProviderStateMixin {
PageController? _controller;
int _currentIndex = 0;
List<MySelectedAllergy> myAllergiesList = List();
List<MySelectedHistory> myHistoryList = List();
List<MySelectedAllergy> myAllergiesList = [];
List<MySelectedHistory> myHistoryList = [];
changePageViewIndex(pageIndex, {isChangeState = true}) {
if (pageIndex != _currentIndex && isChangeState) changeLoadingState(true);

@ -44,7 +44,7 @@ class RegisterConfirmationPatientPage extends StatefulWidget {
final PatientRegistrationViewModel model;
const RegisterConfirmationPatientPage(
{Key key, this.operationReportViewModel, this.patient, this.model})
{Key? key, this.operationReportViewModel, this.patient, this.model})
: super(key: key);
@override

@ -12,7 +12,7 @@ import 'package:flutter/material.dart';
import 'RegisterSearchPatientPage.dart';
class RegisterPatientPage extends StatefulWidget {
const RegisterPatientPage({Key key}) : super(key: key);
const RegisterPatientPage({Key? key}) : super(key: key);
@override
_RegisterPatientPageState createState() => _RegisterPatientPageState();

@ -30,7 +30,7 @@ class RegisterSearchPatientPage extends StatefulWidget {
final PatientRegistrationViewModel model;
const RegisterSearchPatientPage(
{Key key, this.changePageViewIndex, this.model})
{Key? key, this.changePageViewIndex, this.model})
: super(key: key);
@override
@ -66,7 +66,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
@override
void initState() {
_phoneCode.text = "";
countryList = List();
countryList = [];
dynamic ksaCountry = {"id": 967, "name": "Saudi Arabia"};
dynamic uaeCountry = {"id": 971, "name": "United Arab Emirates"};

@ -6,7 +6,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart';
class VerifyActivationCodePage extends StatefulWidget {
const VerifyActivationCodePage({Key key}) : super(key: key);
const VerifyActivationCodePage({Key? key}) : super(key: key);
@override
_VerifyActivationCodePageState createState() =>

@ -399,7 +399,7 @@ class HeaderRow extends StatelessWidget {
final String label;
final String value;
const HeaderRow({Key key, this.label, this.value}) : super(key: key);
const HeaderRow({Key? key, this.label, this.value}) : super(key: key);
@override
Widget build(BuildContext context) {

@ -16,7 +16,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
final bool isInpatient;
ProfileMedicalInfoWidget(
{Key key, this.patient, this.patientType, this.arrivalType, this.from, this.to, this.isInpatient});
{Key? key, this.patient, this.patientType, this.arrivalType, this.from, this.to, this.isInpatient});
@override
Widget build(BuildContext context) {

@ -1,4 +1,5 @@
import 'package:badges/badges.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/doctor_replay_view_model.dart';
import 'package:flutter/cupertino.dart';
@ -14,7 +15,7 @@ class BottomNavigationItem extends StatelessWidget {
final int? index;
final int currentIndex;
final String? name;
final DashboardViewModel dashboardViewModel;
final DashboardViewModel? dashboardViewModel;
BottomNavigationItem(

@ -7,16 +7,16 @@ import 'package:flutter/material.dart';
class CountryTextField extends StatefulWidget {
final dynamic element;
final String elementError;
final List<dynamic> elementList;
final String keyName;
final String keyId;
final String hintText;
final double width;
final String? elementError;
final List<dynamic>? elementList;
final String? keyName;
final String? keyId;
final String? hintText;
final double? width;
final Function(dynamic) okFunction;
CountryTextField(
{Key key,
{Key? key,
@required this.element,
@required this.elementError,
this.width,

Loading…
Cancel
Save