Merge branch 'patient_app_services' into 'development'

Patient app services

See merge request Cloud_Solution/doctor_app_flutter!468
merge-requests/469/merge
Mohammad Aljammal 5 years ago
commit c014dccf53

@ -322,4 +322,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69 PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69
COCOAPODS: 1.10.0.rc.1 COCOAPODS: 1.10.1

@ -46,7 +46,7 @@ class MyApp extends StatelessWidget {
child: Consumer<ProjectViewModel>( child: Consumer<ProjectViewModel>(
builder: (context, projectProvider, child) => MaterialApp( builder: (context, projectProvider, child) => MaterialApp(
showSemanticsDebugger: false, showSemanticsDebugger: false,
title: 'Flutter Demo', title: 'Doctors App',
locale: projectProvider.appLocal, locale: projectProvider.appLocal,
localizationsDelegates: [ localizationsDelegates: [
TranslationBaseDelegate(), TranslationBaseDelegate(),

@ -1,5 +1,6 @@
import 'package:doctor_app_flutter/core/model/procedure/get_ordered_procedure_model.dart'; import 'package:doctor_app_flutter/core/model/procedure/get_ordered_procedure_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.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';
@ -147,7 +148,7 @@ class ProcedureCard extends StatelessWidget {
color: Colors.grey, color: Colors.grey,
), ),
Texts( Texts(
entityList.clinicDescription.toString(), entityList.clinicDescription??"",
bold: true, bold: true,
fontSize: 12, fontSize: 12,
), ),
@ -163,7 +164,7 @@ class ProcedureCard extends StatelessWidget {
if (entityList.categoryID == 2 || if (entityList.categoryID == 2 ||
entityList.categoryID == 4) entityList.categoryID == 4)
InkWell( InkWell(
child: Icon(Icons.edit), child: Icon(DoctorApp.edit),
onTap: onTap, onTap: onTap,
) )
], ],

@ -35,7 +35,6 @@ class ProcedureScreen extends StatelessWidget {
baseViewModel: model, baseViewModel: model,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Container( child: Container(
color: Colors.white,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [

@ -26,7 +26,12 @@ class _HeaderBodyExpandableNotifierState
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
setState(() {
if (widget.isExpand == true) {
widget.expandFlag = widget.isExpand;
widget.controller.expanded = true;
}
});
return ExpandableNotifier( return ExpandableNotifier(
child: Padding( child: Padding(
padding: const EdgeInsets.only(left: 0, right: 0), padding: const EdgeInsets.only(left: 0, right: 0),

Loading…
Cancel
Save