finish assessment screen

merge-requests/950/head
Elham Rababh 4 years ago
parent 406165c348
commit af1217dd67

@ -1119,4 +1119,7 @@ const Map<String, Map<String, String>> localizedValues = {
}, },
"planedProcedure": {"en": "Planed Procedure", "ar": "الإجراء المخطط"}, "planedProcedure": {"en": "Planed Procedure", "ar": "الإجراء المخطط"},
"moreDetails": {"en": "More Details", "ar": "المزيد من التفاصيل"}, "moreDetails": {"en": "More Details", "ar": "المزيد من التفاصيل"},
"VTE_Type": {"en": "VTE Type", "ar": "VTE Type"},
"pharmacology": {"en": "Pharmacology", "ar": "علم العقاقير"},
"reasonsThrombo": {"en": "Reasons Thrombo", "ar": "أسباب ثرومبو"},
}; };

@ -7,19 +7,19 @@ import 'package:doctor_app_flutter/models/discharge_summary/GetDischargeSummaryR
class VteAssessmentService extends BaseService { class VteAssessmentService extends BaseService {
List<VteAssessmentResponseModel> _allDischargeSummaryList = []; List<VteAssessmentResponseModel> _allVteHistoryList = [];
List<VteAssessmentResponseModel> get allDischargeSummaryList => List<VteAssessmentResponseModel> get allVteHistoryList =>
_allDischargeSummaryList; _allVteHistoryList;
Future getVteAssessment( Future getVteAssessment(
{VteAssessmentRequestModel vteAssessmentRequestModel}) async { {VteAssessmentRequestModel vteAssessmentRequestModel}) async {
hasError = false; hasError = false;
await baseAppClient.post(VTE_ASSESSMENT, await baseAppClient.post(VTE_ASSESSMENT,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
_allDischargeSummaryList.clear(); _allVteHistoryList.clear();
response['INP_VTEHistoryByTransactionNo_List'].forEach( response['INP_VTEHistoryByTransactionNo_List'].forEach(
(v) { (v) {
_allDischargeSummaryList.add(VteAssessmentResponseModel.fromJson(v)); _allVteHistoryList.add(VteAssessmentResponseModel.fromJson(v));
}, },
); );
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {

@ -2,7 +2,7 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/vte_assessment/vte_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/vte_assessment/vte_assessment_req_model.dart';
import 'package:doctor_app_flutter/core/model/vte_assessment/vte_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/vte_assessment/vte_assessment_res_model.dart';
import 'package:doctor_app_flutter/core/service/patient/profile/discharge_summary_servive.dart'; import 'package:doctor_app_flutter/core/service/patient/profile/discharge_summary_servive.dart';
import 'package:doctor_app_flutter/core/service/patient/profile/vte_assessment_servive.dart'; import 'package:doctor_app_flutter/core/service/patient/profile/vte_assessment_service.dart';
import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart';
import 'package:doctor_app_flutter/locator.dart'; import 'package:doctor_app_flutter/locator.dart';
import 'package:doctor_app_flutter/models/discharge_summary/GetDischargeSummaryReqModel.dart'; import 'package:doctor_app_flutter/models/discharge_summary/GetDischargeSummaryReqModel.dart';
@ -10,11 +10,11 @@ import 'package:doctor_app_flutter/models/discharge_summary/GetDischargeSummaryR
class VteAssessmentViewModel extends BaseViewModel { class VteAssessmentViewModel extends BaseViewModel {
bool hasError = false; bool hasError = false;
VteAssessmentService _dischargeSummaryService = VteAssessmentService _VteAssessmentService =
locator<VteAssessmentService>(); locator<VteAssessmentService>();
List<VteAssessmentResponseModel> get allVteHistoryList => List<VteAssessmentResponseModel> get allVteHistoryList =>
_dischargeSummaryService.allDischargeSummaryList; _VteAssessmentService.allVteHistoryList;
Future getVteAssessment({ Future getVteAssessment({
int patientId, int patientId,
@ -25,10 +25,10 @@ class VteAssessmentViewModel extends BaseViewModel {
transactionNo: admissionNo); transactionNo: admissionNo);
hasError = false; hasError = false;
setState(ViewState.Busy); setState(ViewState.Busy);
await _dischargeSummaryService.getVteAssessment( await _VteAssessmentService.getVteAssessment(
vteAssessmentRequestModel: vteAssessmentRequestModel); vteAssessmentRequestModel: vteAssessmentRequestModel);
if (_dischargeSummaryService.hasError) { if (_VteAssessmentService.hasError) {
error = _dischargeSummaryService.error; error = _VteAssessmentService.error;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
} else { } else {
setState(ViewState.Idle); setState(ViewState.Idle);

@ -33,7 +33,7 @@ import 'core/service/patient/patient-doctor-referral-service.dart';
import 'core/service/patient/patientInPatientService.dart'; import 'core/service/patient/patientInPatientService.dart';
import 'core/service/patient/patient_service.dart'; import 'core/service/patient/patient_service.dart';
import 'core/service/patient/profile/operation_report_servive.dart'; import 'core/service/patient/profile/operation_report_servive.dart';
import 'core/service/patient/profile/vte_assessment_servive.dart'; import 'core/service/patient/profile/vte_assessment_service.dart';
import 'core/service/patient/referral_patient_service.dart'; import 'core/service/patient/referral_patient_service.dart';
import 'core/service/patient_medical_file/admission_request/patient-admission-request-service.dart'; import 'core/service/patient_medical_file/admission_request/patient-admission-request-service.dart';
import 'core/service/patient_medical_file/insurance/InsuranceCardService.dart'; import 'core/service/patient_medical_file/insurance/InsuranceCardService.dart';

@ -40,9 +40,10 @@ class _ProgressNoteState extends State<VteAssessmentScreen> {
if (routeArgs.containsKey('isDischargedPatient')) if (routeArgs.containsKey('isDischargedPatient'))
isDischargedPatient = routeArgs['isDischargedPatient']; isDischargedPatient = routeArgs['isDischargedPatient'];
return BaseView<VteAssessmentViewModel>( return BaseView<VteAssessmentViewModel>(
onModelReady: (model) => model.getVteAssessment(patientId: patient.patientId, admissionNo: 2016023498 onModelReady: (model) => model.getVteAssessment(patientId: patient.patientId,
admissionNo: 2016023498
//int.parse(patient.admissionNo) // admissionNo:int.parse(patient.admissionNo)
), ),
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
baseViewModel: model, baseViewModel: model,
@ -51,8 +52,8 @@ class _ProgressNoteState extends State<VteAssessmentScreen> {
patient, patient,
isInpatient: true, isInpatient: true,
), ),
body: model.allDisChargeSummaryList == null || body: model.allVteHistoryList == null ||
model.allDisChargeSummaryList.length == 0 model.allVteHistoryList.length == 0
? Center( ? Center(
child: ErrorMessage( child: ErrorMessage(
error: TranslationBase.of(context).noDataAvailable, error: TranslationBase.of(context).noDataAvailable,
@ -65,7 +66,7 @@ class _ProgressNoteState extends State<VteAssessmentScreen> {
Expanded( Expanded(
child: Container( child: Container(
child: ListView.builder( child: ListView.builder(
itemCount: model.allDisChargeSummaryList.length, itemCount: model.allVteHistoryList.length,
itemBuilder: (BuildContext ctxt, int index) { itemBuilder: (BuildContext ctxt, int index) {
return FractionallySizedBox( return FractionallySizedBox(
widthFactor: 0.95, widthFactor: 0.95,
@ -102,10 +103,11 @@ class _ProgressNoteState extends State<VteAssessmentScreen> {
.start, .start,
children: [ children: [
AppText( AppText(
TranslationBase.of( model
context) .allVteHistoryList[
.createdBy, index].riskScore,
fontSize: 12, fontWeight: FontWeight.w600,
fontSize: 14,
), ),
], ],
@ -117,14 +119,14 @@ class _ProgressNoteState extends State<VteAssessmentScreen> {
children: [ children: [
AppText( AppText(
model model
.allDisChargeSummaryList[ .allVteHistoryList[
index] index]
.createdOn != .createdOn !=
null null
? AppDateUtils.getDayMonthYearDateFormatted( ? AppDateUtils.getDayMonthYearDateFormatted(
AppDateUtils AppDateUtils
.getDateTimeFromServerFormat(model .getDateTimeFromString(model
.allDisChargeSummaryList[ .allVteHistoryList[
index] index]
.createdOn), .createdOn),
isArabic: isArabic:
@ -143,14 +145,14 @@ class _ProgressNoteState extends State<VteAssessmentScreen> {
), ),
AppText( AppText(
model model
.allDisChargeSummaryList[ .allVteHistoryList[
index] index]
.createdOn != .createdOn !=
null null
? AppDateUtils.getHour( ? AppDateUtils.getHour(
AppDateUtils AppDateUtils
.getDateTimeFromServerFormat(model .getDateTimeFromString(model
.allDisChargeSummaryList[ .allVteHistoryList[
index] index]
.createdOn)) .createdOn))
: AppDateUtils.getHour( : AppDateUtils.getHour(
@ -174,14 +176,62 @@ class _ProgressNoteState extends State<VteAssessmentScreen> {
children: [ children: [
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(context)
.icd + .VTE_Type +
" : ", " : ",
fontSize: 12, fontSize: 12,
), ),
Expanded( Expanded(
child: AppText( child: AppText(
model model
.allDisChargeSummaryList[ .allVteHistoryList[
index]
.vTEType,
fontSize: 12,
isCopyable: true,
),
),
]),
SizedBox(
height: 8,
),
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context)
.pharmacology +
" : ",
fontSize: 12,
),
Expanded(
child: AppText(
model
.allVteHistoryList[
index]
.pharmacology,
fontSize: 12,
isCopyable: true,
),
),
]),
SizedBox(
height: 8,
),
Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context)
.reasonsThrombo +
" : ",
fontSize: 12,
),
Expanded(
child: AppText(
model
.allVteHistoryList[
index] index]
.reasonsThrombo, .reasonsThrombo,
fontSize: 12, fontSize: 12,
@ -197,15 +247,15 @@ class _ProgressNoteState extends State<VteAssessmentScreen> {
MainAxisAlignment.start, MainAxisAlignment.start,
children: [ children: [
AppText( AppText(
"Ascii Desc : ", "Ambulation Protocol : ",
fontSize: 12, fontSize: 12,
), ),
Expanded( Expanded(
child: AppText( child: AppText(
model model
.allDisChargeSummaryList[ .allVteHistoryList[
index] index]
.riskScore, .ambulationProtocol,
fontSize: 12, fontSize: 12,
isCopyable: true, isCopyable: true,
), ),

@ -1737,6 +1737,9 @@ class TranslationBase {
localizedValues['planedProcedure'][locale.languageCode]; localizedValues['planedProcedure'][locale.languageCode];
String get moreDetails => localizedValues['moreDetails'][locale.languageCode]; String get moreDetails => localizedValues['moreDetails'][locale.languageCode];
String get VTE_Type => localizedValues['VTE_Type'][locale.languageCode];
String get pharmacology => localizedValues['pharmacology'][locale.languageCode];
String get reasonsThrombo => localizedValues['reasonsThrombo'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -763,13 +763,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.11" version: "0.12.11"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.2"
meta: meta:
dependency: transitive dependency: transitive
description: description:
@ -1173,7 +1166,7 @@ packages:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.8" version: "0.4.3"
timing: timing:
dependency: transitive dependency: transitive
description: description:

Loading…
Cancel
Save