Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into html_editor

html_editor
Elham Rababah 5 years ago
commit 1bc01e0ad1

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

@ -6,7 +6,7 @@ class DashboardService extends BaseService {
List<DashboardModel> _dashboardItemsList = []; List<DashboardModel> _dashboardItemsList = [];
List<DashboardModel> get dashboardItemsList => _dashboardItemsList; List<DashboardModel> get dashboardItemsList => _dashboardItemsList;
bool hasVirtualClinic; bool hasVirtualClinic = false;
String sServiceID; String sServiceID;
Future getDashboard() async { Future getDashboard() async {

@ -241,10 +241,10 @@ class _HomeScreenState extends State<HomeScreen> {
), ),
sliderActiveIndex == 1 sliderActiveIndex == 1
? DashboardSliderItemWidget( ? DashboardSliderItemWidget(
model.dashboardItemsList[3]) model.dashboardItemsList[6])
: sliderActiveIndex == 0 : sliderActiveIndex == 0
? DashboardSliderItemWidget( ? DashboardSliderItemWidget(
model.dashboardItemsList[6]) model.dashboardItemsList[3])
: DashboardSliderItemWidget( : DashboardSliderItemWidget(
model.dashboardItemsList[4]), model.dashboardItemsList[4]),
]))) ])))

@ -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/core/viewModel/procedure_View_model.dart';
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/screens/base/base_view.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_checkbox_search_widget.dart';
import 'package:doctor_app_flutter/screens/procedures/entity_list_fav_procedure.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/dr_app_toast_msg.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/app_scaffold_widget.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/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
class AddFavouriteProcedure extends StatefulWidget { class AddFavouriteProcedure extends StatefulWidget {
final ProcedureViewModel model; final ProcedureViewModel model;
@ -91,7 +94,15 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
return; 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) { bool isEntityListSelected(ProcedureTempleteDetailsModel masterKey) {
Iterable<ProcedureTempleteDetailsModel> history = entityList Iterable<ProcedureTempleteDetailsModel> history = entityList.where(
.where((element) => masterKey.templateID == element.templateID && masterKey.procedureName == element.procedureName); (element) =>
masterKey.templateID == element.templateID &&
masterKey.procedureName == element.procedureName);
if (history.length > 0) { if (history.length > 0) {
return true; return true;
} }

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

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

@ -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/base/base_view.dart';
import 'package:doctor_app_flutter/screens/procedures/add-procedure-form.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/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/screens/procedures/update-procedure.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';
@ -103,18 +102,13 @@ class ProcedureScreen extends StatelessWidget {
patient.patientStatusType == 43) patient.patientStatusType == 43)
InkWell( InkWell(
onTap: () { onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(
// builder: (context) => AddProcedureHome(
// patient: patient,
// model: model,
// )),
// );
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => ProcedureCheckOutScreen()), builder: (context) => AddProcedureHome(
patient: patient,
model: model,
)),
); );
}, },
child: Container( child: Container(

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

Loading…
Cancel
Save