progress Note

pull/199/head
Elham Rababah 5 years ago
parent 1491a04b39
commit f97d11183d

@ -0,0 +1,25 @@
class PostProgressNoteRequestModel {
int appointmentNo;
int episodeId;
int patientMRN;
String planNote;
PostProgressNoteRequestModel(
{this.appointmentNo, this.episodeId, this.patientMRN, this.planNote});
PostProgressNoteRequestModel.fromJson(Map<String, dynamic> json) {
appointmentNo = json['appointmentNo'];
episodeId = json['episodeId'];
patientMRN = json['patientMRN'];
planNote = json['planNote'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['appointmentNo'] = this.appointmentNo;
data['episodeId'] = this.episodeId;
data['patientMRN'] = this.patientMRN;
data['planNote'] = this.planNote;
return data;
}
}

@ -1,20 +1,3 @@
import 'dart:convert';
//PatiantInformtion patiantInformtionFromJson(String str) => PatiantInformtion.fromJson(json.decode(str));
////String patiantInformtionToJson(PatiantInformtion data) => json.encode(data.toJson());
//****************************** */
/*
*@author: Amjad Amireh
*@Date:27/4/2020
*@param:
*@return:Patian information Model
*@desc:
*/
class PatiantInformtion { class PatiantInformtion {
final List<PatiantInformtion> list; final List<PatiantInformtion> list;

@ -303,13 +303,12 @@ class _ObjectivePageState extends State<ObjectivePage> {
), ),
DividerWithSpacesAround(height: 30,), DividerWithSpacesAround(height: 30,),
AppButton( AppButton(
title: TranslationBase title: TranslationBase.of(context).next,
.of(context) loading: model.state == ViewState.BusyLocal,
.next, onPressed: () async {
onPressed: () async { await submitObjectivePage(model);
await submitObjectivePage(model); },
}, ),
),
SizedBox( SizedBox(
height: 30, height: 30,
), ),

@ -1,4 +1,6 @@
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/Text.dart';
import 'package:doctor_app_flutter/widgets/shared/TextFields.dart'; import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
@ -42,7 +44,9 @@ class _PlanPageState extends State<PlanPage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final screenSize = MediaQuery.of(context).size; final screenSize = MediaQuery.of(context).size;
return AppScaffold( return BaseView<SOAPViewModel>(
// onModelReady: (model) => model.getMasterLookup(MasterKeysService.Allergies),
builder: (_, model, w) => AppScaffold(
isShowAppBar: false, isShowAppBar: false,
body: SingleChildScrollView( body: SingleChildScrollView(
physics: ScrollPhysics(), physics: ScrollPhysics(),
@ -98,7 +102,7 @@ class _PlanPageState extends State<PlanPage> {
hintText: "Add Progress Note", hintText: "Add Progress Note",
fontSize: 13.5, fontSize: 13.5,
onTapTextFields: () { onTapTextFields: () {
openExaminationList(context); openProgressNote(context);
}, },
readOnly: true, readOnly: true,
// hintColor: Colors.black, // hintColor: Colors.black,
@ -159,10 +163,14 @@ class _PlanPageState extends State<PlanPage> {
), ),
Padding( Padding(
padding: const EdgeInsets.all(0.0), padding: const EdgeInsets.all(0.0),
child: AppText( child: Container(
"Some progress note about", width: MediaQuery.of(context).size.width * 0.6,
fontSize: 10, child: AppText(
color: Colors.grey, progressNoteController.text,
fontSize: 10,
color: Colors.grey,
),
), ),
), ),
], ],
@ -207,7 +215,9 @@ class _PlanPageState extends State<PlanPage> {
Column( Column(
children: [ children: [
InkWell( InkWell(
onTap: () {}, onTap: () {
openProgressNote(context);
},
child: Icon(EvaIcons.edit2Outline), child: Icon(EvaIcons.edit2Outline),
) )
], ],
@ -227,20 +237,22 @@ class _PlanPageState extends State<PlanPage> {
widget.changePageViewIndex(2); widget.changePageViewIndex(2);
}, },
), ),
SizedBox( SizedBox(
height: 30, height: 30,
),
],
), ),
], ),
), ),
), ),),);
),
));
} }
openExaminationList(BuildContext context) { openProgressNote(BuildContext context) {
final screenSize = MediaQuery.of(context).size; final screenSize = MediaQuery
InputDecoration textFieldSelectorDecoration( .of(context)
String hintText, String selectedText, bool isDropDown) { .size;
InputDecoration textFieldSelectorDecoration(String hintText,
String selectedText, bool isDropDown) {
return InputDecoration( return InputDecoration(
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0), borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0),
@ -291,7 +303,7 @@ class _PlanPageState extends State<PlanPage> {
Container( Container(
margin: EdgeInsets.only(left: 0, right: 0, top: 15), margin: EdgeInsets.only(left: 0, right: 0, top: 15),
child: TextFields( child: TextFields(
hintText: "Remarks", hintText: "Add progress note here",
fontSize: 13.5, fontSize: 13.5,
// hintColor: Colors.black, // hintColor: Colors.black,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -300,7 +312,9 @@ class _PlanPageState extends State<PlanPage> {
controller: progressNoteController, controller: progressNoteController,
validator: (value) { validator: (value) {
if (value == null) if (value == null)
return TranslationBase.of(context).emptyMessage; return TranslationBase
.of(context)
.emptyMessage;
else else
return null; return null;
}), }),
@ -310,6 +324,7 @@ class _PlanPageState extends State<PlanPage> {
AppButton( AppButton(
title: "Add".toUpperCase(), title: "Add".toUpperCase(),
onPressed: () { onPressed: () {
Navigator.of(context).pop();
}, },
), ),
]), ]),

Loading…
Cancel
Save