fix issues

flutter_vervion_2_by_elham
Elham Rababh 4 years ago
parent 88e68830bd
commit 0e58e6bdbc

@ -52,7 +52,6 @@ class ClinicByProjectIdRequest {
languageID = json['LanguageID'];
stamp = json['stamp'];
iPAdress = json['IPAdress'];
versionID = json['VersionID'];
channel = json['Channel'];
tokenID = json['TokenID'];
sessionID = json['SessionID'];
@ -67,7 +66,6 @@ class ClinicByProjectIdRequest {
data['LanguageID'] = this.languageID;
data['stamp'] = this.stamp;
data['IPAdress'] = this.iPAdress;
data['VersionID'] = this.versionID;
data['Channel'] = this.channel;
data['TokenID'] = this.tokenID;
data['SessionID'] = this.sessionID;

@ -52,7 +52,7 @@ class _AddPatientSickLeaveScreenState extends State<AddPatientSickLeaveScreen> {
TextEditingController _clinicController = new TextEditingController();
TextEditingController _doctorController = new TextEditingController();
TextEditingController _remarkController = new TextEditingController();
late DateTime currentDate;
DateTime currentDate = DateTime.now();
AddSickLeaveRequest addSickLeave = AddSickLeaveRequest();
bool isFormSubmitted = false;

@ -134,11 +134,12 @@ class _PatientMakeReferralScreenState extends State<PatientMakeReferralScreen> {
fontWeight: FontWeight.w700,
color: HexColor("#359846"),
onPressed: () async {
setState(() async {
await locator<AnalyticsService>().logEvent(
eventCategory: "Refer Patient",
eventAction: "Submit Refer",
);
await locator<AnalyticsService>().logEvent(
eventCategory: "Refer Patient",
eventAction: "Submit Refer",
);
setState(() {
if (_referTo == null) {
branchError = TranslationBase.of(context).fieldRequired!;
} else {
@ -298,18 +299,16 @@ class _PatientMakeReferralScreenState extends State<PatientMakeReferralScreen> {
usingSearch: true,
hintSearchText: TranslationBase.of(context).clinicSearch,
okText: TranslationBase.of(context).ok,
okFunction: (selectedValue) {
setState(() async {
_selectedDoctor = null;
_selectedClinic = selectedValue;
GifLoaderDialogUtils.showMyDialog(context);
await model
.getClinicDoctors(patient, _selectedClinic['ClinicID'], _selectedBranch['facilityId'])
.then((_) => GifLoaderDialogUtils.hideDialog(context));
if (model.state == ViewState.ErrorLocal) {
DrAppToastMsg.showErrorToast(model.error);
}
});
okFunction: (selectedValue) async {
_selectedDoctor = null;
_selectedClinic = selectedValue;
GifLoaderDialogUtils.showMyDialog(context);
await model
.getClinicDoctors(patient, _selectedClinic['ClinicID'], _selectedBranch['facilityId'])
.then((_) => GifLoaderDialogUtils.hideDialog(context));
if (model.state == ViewState.ErrorLocal) {
DrAppToastMsg.showErrorToast(model.error);
}
},
);
showDialog(

@ -110,7 +110,8 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
String? frequencyError;
String? doseTimeError;
String? durationError;
String? unitError;
String? unitError
;
String? strengthError;
late int selectedType;
@ -484,7 +485,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
? model
.itemMedicineListUnit[0]
: units,
elementError: unitError!,
elementError: unitError,
keyName: 'description',
keyId: 'parameterCode',
hintText: 'Select',
@ -511,7 +512,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
1
? model.itemMedicineListRoute[0]
: route,
elementError: routeError!,
elementError: routeError,
keyId: 'parameterCode',
keyName: 'description',
okFunction: (selectedValue) {

@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
class PrescriptionTextFiled extends StatefulWidget {
dynamic element;
final String elementError;
final String? elementError;
final bool? isSubmitted;
final List<dynamic> elementList;
final String keyName;

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save