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

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

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

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

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

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