first step from service part

merge-requests/879/head
Elham Rababh 4 years ago
parent 514fb71c51
commit 3eddf2eab5

@ -159,11 +159,11 @@ class PatientRegistrationViewModel extends BaseViewModel {
} }
Future registrationPatient(PatientRegistrationModel registrationModel) async { Future registrationPatient(PatientRegistrationModel registrationModel) async {
setState(ViewState.Busy); setState(ViewState.BusyLocal);
await _patientRegistrationService.registrationPatient(registrationModel); await _patientRegistrationService.registrationPatient(registrationModel);
if (_patientRegistrationService.hasError) { if (_patientRegistrationService.hasError) {
error = _patientRegistrationService.error; error = _patientRegistrationService.error;
setState(ViewState.Error); setState(ViewState.ErrorLocal);
} else } else
setState(ViewState.Idle); setState(ViewState.Idle);
} }

@ -17,6 +17,7 @@ import 'package:doctor_app_flutter/models/operation_report/create_update_operati
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/models/patient/progress_note_request.dart'; import 'package:doctor_app_flutter/models/patient/progress_note_request.dart';
import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart';
import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
@ -28,6 +29,7 @@ import 'package:doctor_app_flutter/widgets/shared/speech-text-popup.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:speech_to_text/speech_recognition_error.dart'; import 'package:speech_to_text/speech_recognition_error.dart';
@ -38,13 +40,10 @@ import 'CustomEditableText.dart';
class RegisterConfirmationPatientPage extends StatefulWidget { class RegisterConfirmationPatientPage extends StatefulWidget {
final OperationReportViewModel operationReportViewModel; final OperationReportViewModel operationReportViewModel;
final PatiantInformtion patient; final PatiantInformtion patient;
final PatientRegistrationViewModel model; final PatientRegistrationViewModel model;
const RegisterConfirmationPatientPage( const RegisterConfirmationPatientPage(
{Key key, {Key key, this.operationReportViewModel, this.patient, this.model})
this.operationReportViewModel,
this.patient, this.model})
: super(key: key); : super(key: key);
@override @override
@ -56,17 +55,28 @@ class _RegisterConfirmationPatientPageState
extends State<RegisterConfirmationPatientPage> { extends State<RegisterConfirmationPatientPage> {
bool isSubmitted = false; bool isSubmitted = false;
ProjectViewModel projectViewModel; ProjectViewModel projectViewModel;
TextEditingController firstName; TextEditingController firstNameN;
TextEditingController middleName ; TextEditingController middleNameN;
TextEditingController lastName; TextEditingController lastNameN;
TextEditingController firstNameAr;
TextEditingController middleNameAr;
TextEditingController lastNameAr;
TextEditingController emailAddressController; TextEditingController emailAddressController;
@override @override
void initState() { void initState() {
firstName = TextEditingController(text: widget.model.getPatientInfoResponseModel.firstNameEn); firstNameN = TextEditingController(
middleName = TextEditingController(text: ""); text: widget.model.getPatientInfoResponseModel.firstNameEn);
lastName = TextEditingController(text: widget.model.getPatientInfoResponseModel.lastNameEn); middleNameN = TextEditingController(text: "");
lastNameN = TextEditingController(
text: widget.model.getPatientInfoResponseModel.lastNameEn);
firstNameAr = TextEditingController(
text: widget.model.getPatientInfoResponseModel.firstNameAr);
middleNameAr = TextEditingController(text: "");
lastNameAr = TextEditingController(
text: widget.model.getPatientInfoResponseModel.lastNameAr);
emailAddressController = TextEditingController(text: "");
super.initState(); super.initState();
} }
@ -95,23 +105,41 @@ class _RegisterConfirmationPatientPageState
child: Column( child: Column(
children: [ children: [
CustomEditableText( CustomEditableText(
controller: firstName, controller: firstNameN,
hint: TranslationBase.of(context).firstName), hint: TranslationBase.of(context).firstName),
SizedBox( SizedBox(
height: 4, height: 4,
), ),
CustomEditableText( CustomEditableText(
controller: middleName, controller: middleNameN,
hint: TranslationBase.of(context).middleName), hint: TranslationBase.of(context).middleName),
SizedBox( SizedBox(
height: 4, height: 4,
), ),
CustomEditableText( CustomEditableText(
controller: lastName, controller: lastNameN,
hint: TranslationBase.of(context).lastName), hint: TranslationBase.of(context).lastName),
SizedBox( SizedBox(
height: 20, height: 20,
), ),
CustomEditableText(
controller: firstNameAr,
hint: "First Name Arabic"),
SizedBox(
height: 4,
),
CustomEditableText(
controller: middleNameAr,
hint: "Middle Name Arabic"),
SizedBox(
height: 4,
),
CustomEditableText(
controller: lastNameAr,
hint: "Last Name Arabic"),
SizedBox(
height: 20,
),
FractionallySizedBox( FractionallySizedBox(
widthFactor: .9, widthFactor: .9,
child: Center( child: Center(
@ -148,7 +176,6 @@ class _RegisterConfirmationPatientPageState
color: Colors.black), color: Colors.black),
AppText( AppText(
"${widget.model.getPatientInfoResponseModel.idNumber}", "${widget.model.getPatientInfoResponseModel.idNumber}",
fontSize: 12, fontSize: 12,
color: Colors.grey[600], color: Colors.grey[600],
), ),
@ -193,7 +220,6 @@ class _RegisterConfirmationPatientPageState
color: Colors.black), color: Colors.black),
AppText( AppText(
"${widget.model.getPatientInfoResponseModel.occupation}", "${widget.model.getPatientInfoResponseModel.occupation}",
fontSize: 12, fontSize: 12,
color: Colors.grey[600], color: Colors.grey[600],
), ),
@ -222,7 +248,6 @@ class _RegisterConfirmationPatientPageState
color: Colors.black), color: Colors.black),
AppText( AppText(
"${widget.model.checkPatientForRegistrationModel.patientMobileNumber}", "${widget.model.checkPatientForRegistrationModel.patientMobileNumber}",
fontSize: 12, fontSize: 12,
color: Colors.grey[600], color: Colors.grey[600],
), ),
@ -341,32 +366,77 @@ class _RegisterConfirmationPatientPageState
fontColor: Colors.white, fontColor: Colors.white,
fontSize: 2.0, fontSize: 2.0,
onPressed: () async { onPressed: () async {
print(widget.model
.getPatientInfoResponseModel.dateOfBirth);
var dateFormat = DateFormat('MM/dd/yyyy').parse(widget.model
.getPatientInfoResponseModel.dateOfBirth);
String wellFormat = "${dateFormat.day}\/${dateFormat.month}\/${dateFormat.year}";
print (dateFormat.toUtc().toString());
// return ;
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
PatientRegistrationModel PatientRegistrationModel patientRegistrationModel =
patientRegistrationModel = PatientRegistrationModel(
PatientRegistrationModel( patientobject: Patientobject(
// patientIdentificationID: tempValue: true,
// int.parse(_idController.text), patientIdentificationNo: widget
// patientMobileNumber: .model
// int.parse(_phoneController.text), .checkPatientForRegistrationModel
// zipCode: _phoneCode.text, .patientIdentificationID
isHijri: 0, .toString(),
isDentalAllowedBackend: false, patientIdentificationType: 1,
patientOutSA: 0, firstName: firstNameAr.text,
generalid: GENERAL_ID, firstNameN: firstNameN.text,
// dOB: lastName: lastNameAr.text,
// "${AppDateUtils.convertStringToDateFormat(_birthDate.toString(), "yyyy/MM/dd")}" lastNameN: lastNameN.text,
); middleName: middleNameAr.text,
await widget.model.registrationPatient( middleNameN: middleNameN.text,
patientRegistrationModel); strDateofBirth: dateFormat.toUtc().toString(),
if(widget.model.state == ViewState.ErrorLocal){ dateofBirth: AppDateUtils.convertToServerFormat(widget.model.getPatientInfoResponseModel.dateOfBirth, 'MM/dd/yyyy'),
dateofBirthN: wellFormat,
gender: (widget.model.getPatientInfoResponseModel.gender == "M")
? 1
: 2,
sourceType: "1",
patientOutSA: 0,
nationalityID: widget
.model
.getPatientInfoResponseModel
.nationalityCode,
//todo Elham* change static value to dynamic
preferredLanguage: "1",
marital: "0",
eHealthIDField: widget
.model.getPatientInfoResponseModel.healthId,
emailAddress: emailAddressController.text,
mobileNumber: widget
.model
.checkPatientForRegistrationModel
.patientMobileNumber),
isHijri: 0,
logInTokenID: "zjgvKtLC/EK+saznJ/OkiA==",
isDentalAllowedBackend: false,
patientOutSA: 0,
sessionID: null,
patientMobileNumber:
widget.model.checkPatientForRegistrationModel.patientMobileNumber.toString(),
healthId: widget.model.getPatientInfoResponseModel.healthId,
generalid: GENERAL_ID,
patientIdentificationID: widget.model.checkPatientForRegistrationModel.patientIdentificationID.toString(),
dOB:wellFormat,
zipCode: widget.model.checkPatientForRegistrationModel.zipCode);
await widget.model
.registrationPatient(patientRegistrationModel);
if (widget.model.state == ViewState.ErrorLocal) {
Helpers.showErrorToast(widget.model.error); Helpers.showErrorToast(widget.model.error);
} else { } else {
Navigator.of(context).pop(); Navigator.of(context).pop();
} }
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
}, },
), ),
), ),
@ -413,7 +483,6 @@ class _RegisterConfirmationPatientPageState
), ),
], ],
), ),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
@ -522,7 +591,6 @@ class _RegisterConfirmationPatientPageState
), ),
], ],
), ),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
@ -568,11 +636,9 @@ class _RegisterConfirmationPatientPageState
], ],
), ),
), ),
], ],
), ),
); );
}); });
} }
} }

@ -24,6 +24,10 @@ class AppDateUtils {
return convertDateToFormat(dateTime, dateFormat); return convertDateToFormat(dateTime, dateFormat);
} }
static String convertToServerFormat(String date, String dateFormat){
return '/Date(${DateFormat(dateFormat).parse(date).millisecondsSinceEpoch})/';
}
static convertDateFromServerFormat(String str, dateFormat) { static convertDateFromServerFormat(String str, dateFormat) {
var date = getDateTimeFromServerFormat(str); var date = getDateTimeFromServerFormat(str);

Loading…
Cancel
Save