Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'prescription_changes' into 'development'

Browse Source 
Procedure template service

See merge request Cloud_Solution/doctor_app_flutter!680
merge-requests/681/merge
Mohammad Aljammal 3 years ago
parent acd709368b d50740b9b9
commit 08d72ed121
7 changed files with 84 additions and 53 deletions
Show Stats Download Patch File Download Diff File

2
lib/config/config.dart
Unescape Escape View File

@ -5,7 +5,7 @@ const ONLY_NUMBERS = "[0-9]";
const ONLY_LETTERS = "[a-zA-Z &'\"]";
const ONLY_DATE = "[0-9/]";
const BASE_URL = 'https://hmgwebservices.com/';
// const BASE_URL = 'https://uat.hmgwebservices.com/';
//const BASE_URL = 'https://uat.hmgwebservices.com/';
const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
const PATIENT_PROGRESS_NOTE_URL =

8
lib/core/model/procedure/procedure_template_details_model.dart
Unescape Escape View File

@ -17,6 +17,9 @@ class ProcedureTempleteDetailsModel {
String categoryID;
String subGroupID;
dynamic riskCategoryID;
String type = "1";
String remarks;
int selectedType = 0;
ProcedureTempleteDetailsModel(
{this.setupID,
@ -36,7 +39,10 @@ class ProcedureTempleteDetailsModel {
this.aliasN,
this.categoryID,
this.subGroupID,
this.riskCategoryID});
this.riskCategoryID,
this.remarks,
this.type = "1",
this.selectedType = 0});
ProcedureTempleteDetailsModel.fromJson(Map<String, dynamic> json) {
setupID = json['SetupID'];

19
lib/screens/procedures/add-favourite-procedure.dart
Unescape Escape View File

@ -5,14 +5,17 @@ import 'package:doctor_app_flutter/core/model/procedure/procedure_template_detai
import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/procedures/add_procedure_homeScreen.dart';
import 'package:doctor_app_flutter/screens/procedures/entity_list_checkbox_search_widget.dart';
import 'package:doctor_app_flutter/screens/procedures/entity_list_fav_procedure.dart';
import 'package:doctor_app_flutter/screens/procedures/procedure_checkout_screen.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
class AddFavouriteProcedure extends StatefulWidget {
final ProcedureViewModel model;
@ -91,7 +94,15 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
return;
}
Navigator.pop(context);
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => ProcedureCheckOutScreen(
items: entityList,
model: model,
patient: widget.patient,
)),
);
},
),
],
@ -104,8 +115,10 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
}
bool isEntityListSelected(ProcedureTempleteDetailsModel masterKey) {
Iterable<ProcedureTempleteDetailsModel> history = entityList
.where((element) => masterKey.templateID == element.templateID && masterKey.procedureName == element.procedureName);
Iterable<ProcedureTempleteDetailsModel> history = entityList.where(
(element) =>
masterKey.templateID == element.templateID &&
masterKey.procedureName == element.procedureName);
if (history.length > 0) {
return true;
}

2
lib/screens/procedures/add-procedure-form.dart
Unescape Escape View File

@ -60,7 +60,7 @@ postProcedure(
controlValue: element.remarks != null ? element.remarks : ""),
);
controls.add(
Controls(code: "ordertype", controlValue: "0"),
Controls(code: "ordertype", controlValue: element.type ?? "1"),
);
controlsProcedure.add(Procedures(
category: element.categoryID,

86
lib/screens/procedures/procedure_checkout_screen.dart
Unescape Escape View File

@ -1,7 +1,10 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/model/procedure/categories_procedure.dart';
import 'package:doctor_app_flutter/core/model/procedure/procedure_template_details_model.dart';
import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/procedures/add-procedure-form.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
@ -12,21 +15,20 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
class ProcedureCheckOutScreen extends StatefulWidget {
ProcedureCheckOutScreen({this.items, this.model, this.patient});
final List<ProcedureTempleteDetailsModel> items;
final ProcedureViewModel model;
final PatiantInformtion patient;
@override
_ProcedureCheckOutScreenState createState() =>
_ProcedureCheckOutScreenState();
}
class _ProcedureCheckOutScreenState extends State<ProcedureCheckOutScreen> {
List<EntityList> items = List();
List<String> remarksList = List();
final TextEditingController remarksController = TextEditingController();
List<int> typeList = List();
int selectedType = 0;
setSelectedType(int val) {
setState(() {
selectedType = val;
});
}
@override
Widget build(BuildContext context) {
@ -44,7 +46,7 @@ class _ProcedureCheckOutScreenState extends State<ProcedureCheckOutScreen> {
Container(
color: Colors.white,
child: Padding(
padding: const EdgeInsets.all(15.0),
padding: EdgeInsets.all(12.0),
child: Row(
//mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
@ -69,18 +71,17 @@ class _ProcedureCheckOutScreenState extends State<ProcedureCheckOutScreen> {
),
),
),
SizedBox(
height: MediaQuery.of(context).size.height * 0.022,
),
Padding(
padding: const EdgeInsets.all(8.0),
padding: const EdgeInsets.only(
left: 12.0, right: 12.0, bottom: 26.0, top: 10),
child: ListView.builder(
scrollDirection: Axis.vertical,
physics: AlwaysScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: 1,
itemCount: widget.items.length,
itemBuilder: (BuildContext context, int index) {
return Container(
margin: EdgeInsets.only(bottom: 15.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius:
@ -97,7 +98,9 @@ class _ProcedureCheckOutScreenState extends State<ProcedureCheckOutScreen> {
SizedBox(
width: 6.0,
),
AppText('Procedure Name'),
Expanded(
child:
AppText(widget.items[index].procedureName)),
],
),
children: [
@ -125,12 +128,14 @@ class _ProcedureCheckOutScreenState extends State<ProcedureCheckOutScreen> {
Radio(
activeColor: Color(0xFFD02127),
value: 0,
groupValue: selectedType,
groupValue:
widget.items[index].selectedType,
onChanged: (value) {
// historyInfo.type =
// setSelectedType(value).toString();
//
// historyInfo.type = value.toString();
widget.items[index].selectedType = 0;
setState(() {
widget.items[index].type =
value.toString();
});
},
),
AppText(
@ -140,13 +145,15 @@ class _ProcedureCheckOutScreenState extends State<ProcedureCheckOutScreen> {
),
Radio(
activeColor: Color(0xFFD02127),
groupValue: selectedType,
groupValue:
widget.items[index].selectedType,
value: 1,
onChanged: (value) {
// historyInfo.type =
// setSelectedType(value).toString();
//
// historyInfo.type = value.toString();
widget.items[index].selectedType = 1;
setState(() {
widget.items[index].type =
value.toString();
});
},
),
AppText(
@ -168,9 +175,9 @@ class _ProcedureCheckOutScreenState extends State<ProcedureCheckOutScreen> {
horizontal: 12, vertical: 15.0),
child: TextFields(
hintText: TranslationBase.of(context).remarks,
//controller: remarksController,
controller: remarksController,
onChanged: (value) {
// historyInfo.remarks = value;
widget.items[index].remarks = value;
},
minLines: 3,
maxLines: 5,
@ -198,7 +205,7 @@ class _ProcedureCheckOutScreenState extends State<ProcedureCheckOutScreen> {
title: TranslationBase.of(context).addSelectedProcedures,
color: Color(0xff359846),
fontWeight: FontWeight.w700,
onPressed: () {
onPressed: () async {
//print(entityList.toString());
onPressed:
// if (entityList.isEmpty == true) {
@ -208,14 +215,25 @@ class _ProcedureCheckOutScreenState extends State<ProcedureCheckOutScreen> {
// );
// return;
// }
List<EntityList> entityList = List();
widget.items.forEach((element) {
entityList.add(
EntityList(
procedureId: element.procedureID,
remarks: element.remarks,
categoryID: element.categoryID,
type: element.type,
),
);
});
Navigator.pop(context);
await postProcedure(
entityList: entityList,
patient: widget.patient,
model: widget.model,
remarks: remarksController.text);
Navigator.pop(context);
Navigator.pop(context);
// postProcedure(
// orderType: selectedType.toString(),
// entityList: entityList,
// patient: patient,
// model: widget.model,
// remarks: remarksController.text);
},
),
],

14
lib/screens/procedures/procedure_screen.dart
Unescape Escape View File

@ -7,7 +7,6 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/procedures/add-procedure-form.dart';
import 'package:doctor_app_flutter/screens/procedures/add_procedure_homeScreen.dart';
import 'package:doctor_app_flutter/screens/procedures/procedure_checkout_screen.dart';
import 'package:doctor_app_flutter/screens/procedures/update-procedure.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
@ -103,18 +102,13 @@ class ProcedureScreen extends StatelessWidget {
patient.patientStatusType == 43)
InkWell(
onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(
// builder: (context) => AddProcedureHome(
// patient: patient,
// model: model,
// )),
// );
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => ProcedureCheckOutScreen()),
builder: (context) => AddProcedureHome(
patient: patient,
model: model,
)),
);
},
child: Container(

6
pubspec.lock
Unescape Escape View File

@ -629,7 +629,7 @@ packages:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0-nullsafety.3"
version: "1.3.0-nullsafety.4"
mime:
dependency: transitive
description:
@ -921,7 +921,7 @@ packages:
name: stack_trace
url: "https://pub.dartlang.org"
source: hosted
version: "1.10.0-nullsafety.1"
version: "1.10.0-nullsafety.2"
sticky_headers:
dependency: "direct main"
description:
@ -1119,5 +1119,5 @@ packages:
source: hosted
version: "2.2.1"
sdks:
dart: ">=2.10.0 <2.11.0"
dart: ">=2.10.0 <=2.11.0-213.1.beta"
flutter: ">=1.22.0 <2.0.0"

Write Preview
Loading…
Cancel
Save