|
|
|
|
@ -334,15 +334,13 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
|
|
|
|
|
width: 10.0,
|
|
|
|
|
),
|
|
|
|
|
Texts(
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
|
|
TranslationBase.of(context).refine,
|
|
|
|
|
// 'Refine',
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
=======
|
|
|
|
|
'Refine',
|
|
|
|
|
|
|
|
|
|
fontWeight:
|
|
|
|
|
FontWeight.w600,
|
|
|
|
|
>>>>>>> bcd99555e3e980ea8ec5f30a74c9e167c8520d9f
|
|
|
|
|
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 250.0,
|
|
|
|
|
@ -371,14 +369,10 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
|
|
|
|
|
Column(
|
|
|
|
|
children: [
|
|
|
|
|
ExpansionTile(
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
|
|
title: Texts( TranslationBase.of(
|
|
|
|
|
context)
|
|
|
|
|
.categorise),
|
|
|
|
|
=======
|
|
|
|
|
title:
|
|
|
|
|
Texts('Categorise'),
|
|
|
|
|
>>>>>>> bcd99555e3e980ea8ec5f30a74c9e167c8520d9f
|
|
|
|
|
children: [
|
|
|
|
|
ProcedureListWidget(
|
|
|
|
|
model: model,
|
|
|
|
|
@ -550,16 +544,14 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
|
|
|
|
|
Container(
|
|
|
|
|
width: 100,
|
|
|
|
|
child: Button(
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
|
|
label: TranslationBase.of(
|
|
|
|
|
context)
|
|
|
|
|
.reset,
|
|
|
|
|
backgroundColor: Colors.red,
|
|
|
|
|
=======
|
|
|
|
|
label: 'Reset',
|
|
|
|
|
backgroundColor:
|
|
|
|
|
Colors.red,
|
|
|
|
|
>>>>>>> bcd99555e3e980ea8ec5f30a74c9e167c8520d9f
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
@ -623,17 +615,13 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
|
|
|
|
|
Navigator.pop(
|
|
|
|
|
context);
|
|
|
|
|
},
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
|
|
label: TranslationBase.of(
|
|
|
|
|
context)
|
|
|
|
|
.apply,
|
|
|
|
|
backgroundColor: Colors.green,
|
|
|
|
|
=======
|
|
|
|
|
label: 'Apply',
|
|
|
|
|
backgroundColor:
|
|
|
|
|
Colors
|
|
|
|
|
.green,
|
|
|
|
|
>>>>>>> bcd99555e3e980ea8ec5f30a74c9e167c8520d9f
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
|