WIP:merge issue resolve

update_flutter_3.24_vida_plus_episode_v2
taha.alam 1 year ago
parent 8bf2ca3a63
commit 726f25b91b

@ -302,7 +302,7 @@ class _PatientProfileScreenState extends State<PatientProfileScreen> with Single
}); });
}else { }else {
Navigator.of(context).pushNamed( Navigator.of(context).pushNamed(
UPDATE_EPISODE, arguments: { UPDATE_EPISODE_VIDA_PLUS, arguments: {
'patient': patient 'patient': patient
}); });
} }

@ -1,4 +1,5 @@
import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart';
import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart';
import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/empty_complaints.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/empty_complaints.dart';
import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
@ -22,10 +23,12 @@ class UpdateChiefComplaints extends StatelessWidget {
if (complaints.isEmpty) ...{ if (complaints.isEmpty) ...{
EmptyComplaints() EmptyComplaints()
} else ...{ } else ...{
// ListView.builder( ListView.builder(
// itemBuilder: (_, index) => ComplaintItems(complaints[index], onCrossClicked:(){ itemBuilder: (_, index) => ComplaintItems(
// complaint: complaints[index],
// })) onCrossClicked: (complaints) {
}))
} }
]), ]),
); );

@ -1,5 +1,27 @@
// import 'package:flutter/material.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
// import 'package:flutter/material.dart';
// class ComplaintItems extends StatelessWidget{
// class ComplaintItems extends StatelessWidget{
// } final String complaint;
final Function(String) onCrossClicked;
const ComplaintItems({super.key, required this.complaint, required this.onCrossClicked});
@override
Widget build(BuildContext context) {
return ListTile(
title: AppText(complaint,fontWeight: FontWeight.w400, fontSize: 14,color: Color(0xFF575757),),
trailing: IconButton(
onPressed: (){
onCrossClicked(complaint);
},
icon: Icon(
Icons.close,
color: Color(0xFFD02127),
),
),
);
}
}

@ -14,16 +14,18 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
class UpdateSoapIndexVidaPlus extends StatefulWidget { class UpdateSoapIndexVidaPlus extends StatefulWidget {
final bool isUpdate; final bool isUpdate;
const UpdateSoapIndexVidaPlus({Key? key, this.isUpdate = false}) : super(key: key); const UpdateSoapIndexVidaPlus({Key? key, this.isUpdate = false}) : super(key: key);
@override @override
_UpdateSoapIndexState createState() => _UpdateSoapIndexState(); _UpdateSoapIndexVidaPlusState createState() => _UpdateSoapIndexVidaPlusState();
} }
class _UpdateSoapIndexState extends State<UpdateSoapIndexVidaPlus> with TickerProviderStateMixin { class _UpdateSoapIndexVidaPlusState extends State<UpdateSoapIndexVidaPlus>
with TickerProviderStateMixin {
PageController? _controller; PageController? _controller;
int _currentIndex = 0; int _currentIndex = 0;
List<MySelectedAllergy> myAllergiesList = []; List<MySelectedAllergy> myAllergiesList = [];
@ -70,7 +72,9 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndexVidaPlus> with TickerPr
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
decoration: BoxDecoration(boxShadow: <BoxShadow>[], color: Theme.of(context).scaffoldBackgroundColor), decoration: BoxDecoration(
boxShadow: <BoxShadow>[],
color: Theme.of(context).scaffoldBackgroundColor),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -88,8 +92,11 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndexVidaPlus> with TickerPr
}, },
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
children: <Widget>[ children: <Widget>[
//todo add widgets here UpdateSubjectivePage(
changePageViewIndex: changePageViewIndex,
currentIndex: _currentIndex,
patientInfo: patient,
changeLoadingState: changeLoadingState)
], ],
), ),
) )
@ -101,32 +108,35 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndexVidaPlus> with TickerPr
), ),
bottomSheet: _isLoading bottomSheet: _isLoading
? Container( ? Container(
height: 0, height: 0,
) )
: Container( : Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(0.0), Radius.circular(0.0),
), ),
border: Border.all(color: HexColor('#707070'), width: 0), border: Border.all(color: HexColor('#707070'), width: 0),
), ),
height: SizeConfig.heightMultiplier! * (SizeConfig.isHeightVeryShort ? 12 : 10), height: SizeConfig.heightMultiplier! *
width: double.infinity, (SizeConfig.isHeightVeryShort ? 12 : 10),
child: Column( width: double.infinity,
children: [ child: Column(
SizedBox( children: [
height: 10, SizedBox(
), height: 10,
Container( ),
child: FractionallySizedBox(widthFactor: .80, child: getBottomSheet(model, patient)), Container(
), child: FractionallySizedBox(
SizedBox( widthFactor: .80,
height: 5, child: getBottomSheet(model, patient)),
),
SizedBox(
height: 5,
),
],
),
), ),
],
),
),
), ),
); );
} }
@ -171,7 +181,11 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndexVidaPlus> with TickerPr
), ),
Expanded( Expanded(
child: AppButton( child: AppButton(
title: patient.admissionNo != null && patient.admissionNo!.isNotEmpty && !model.isAddExamInProgress ? TranslationBase.of(context).finish : TranslationBase.of(context).next, title: patient.admissionNo != null &&
patient.admissionNo!.isNotEmpty &&
!model.isAddExamInProgress
? TranslationBase.of(context).finish
: TranslationBase.of(context).next,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Colors.red[700]!, color: Colors.red[700]!,
// height: SizeConfig.heightMultiplier! * // height: SizeConfig.heightMultiplier! *
@ -246,7 +260,9 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndexVidaPlus> with TickerPr
), ),
Expanded( Expanded(
child: AppButton( child: AppButton(
title: model.isAddProgress ? TranslationBase.of(context).next : TranslationBase.of(context).finish, title: model.isAddProgress
? TranslationBase.of(context).next
: TranslationBase.of(context).finish,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Colors.red[700]!, color: Colors.red[700]!,
disabled: model.progressNoteText.isEmpty, disabled: model.progressNoteText.isEmpty,

Loading…
Cancel
Save