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

Merge branch 'update_flutter_3.24_vida_plus_episode' of http://34.17.52.180/Haroon6138/doctor_app_flutter into update_flutter_3.24_vida_plus_episode

Browse Source
update_flutter_3.24_vida_plus_episode_MDS
Sultan khan 11 months ago
parent 9fcef3107f 629bab2b44
commit 57a542c31e
10 changed files with 104 additions and 78 deletions
Show Stats Download Patch File Download Diff File

2
lib/core/service/patient_medical_file/soap/SOAP_service.dart
Unescape Escape View File

@ -1258,7 +1258,7 @@ class SOAPService extends LookupService {
Map<String, dynamic> request = {
"planNote": note,
"PatientMRN": patient.patientMRN,
"EpisodeID": patient.episodeNo,
"EpisodeID": patient.pomrId,
"CreatedByName": patient.doctorName,
"CreatedBy": patient.doctorId,
"Speciality": clinicID,

18
lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart
Unescape Escape View File

@ -62,21 +62,23 @@ class _AddDiagnosisState extends State<AddDiagnosis>
controller: _tabController,
tabs: [
Tab(
child: AppText(
child: Text(
TranslationBase.of(context).mappedDiagnosis,
color: Color(0xFF6D6D6D),
fontSize: 14,
fontWeight: FontWeight.w600,
letterSpacing: -0.56,
style:TextStyle(
color: Color(0xFF6D6D6D),
fontSize: 14,
fontWeight: FontWeight.w600,
letterSpacing: -0.56,
)
),
),
Tab(
child: AppText(
child: Text(
TranslationBase.of(context).favoriteDiagnosis,
color: Color(0xFF6D6D6D),
style: TextStyle(color: Color(0xFF6D6D6D),
fontSize: 14,
fontWeight: FontWeight.w600,
letterSpacing: -0.56,
letterSpacing: -0.56,)
),
),
],

24
lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart
Unescape Escape View File

@ -107,31 +107,33 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage>
),
SizedBox(
height: 56,
height: 64,
child: TabBar(
indicatorColor: Color(0xFFD02127),
unselectedLabelColor: Color(0xFF6D6D6D),
labelColor: Color(0xFF2B353E),
tabs: [
Tab(
child: AppText(
child: Text(
TranslationBase.of(context)
.currentDiagnosis,
style: TextStyle(
color: Color(0xFF6D6D6D),
fontSize: 14,
fontWeight: FontWeight.w600,
letterSpacing: -0.56,
letterSpacing: -0.56,)
),
),
Tab(
child: AppText(
TranslationBase.of(context)
.previousDiagnosis,
color: Color(0xFF6D6D6D),
fontSize: 14,
fontWeight: FontWeight.w600,
letterSpacing: -0.56,
),
child: Text(
TranslationBase.of(context)
.previousDiagnosis,
style: TextStyle(
color: Color(0xFF6D6D6D),
fontSize: 14,
fontWeight: FontWeight.w600,
letterSpacing: -0.56,)
)
)
],
controller: _tabController,

15
lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart
Unescape Escape View File

@ -127,16 +127,25 @@ class _EditDiagnosisState extends State<EditDiagnosis> {
);
},
onChanged: (value) {
if (value != null) _onTextChanged(value);
},
onFieldSubmitted: () {
},
onEditingComplete: (){
if(filteredSearchController.text.isEmpty) return;
_onStopped(filteredSearchController.text);
},
onFieldSubmitted: () {},
suffixIcon: IconButton(
icon: Icon(
Icons.search,
color: Color(0xff2B353E),
size: 30,
),
onPressed: () {},
onPressed: () {
if(filteredSearchController.text.isEmpty) return;
_onStopped(filteredSearchController.text);
},
),
),
Positioned(

25
lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart
Unescape Escape View File

@ -42,13 +42,13 @@ class _EnterDiagnosisState extends State<EnterDiagnosis> {
SearchDiagnosis? selectedDiagnosis;
void _onTextChanged(String text) {
if (_tTimer != null) {
_tTimer!.cancel();
}
if(text.isEmpty) return;
_tTimer = Timer(Duration(milliseconds: 500), () {
_onStopped(text);
});
// if (_tTimer != null) {
// _tTimer!.cancel();
// }
// if(text.isEmpty) return;
// _tTimer = Timer(Duration(milliseconds: 500), () {
// _onStopped(text);
// });
}
void _onStopped(String searchText) async {
@ -94,16 +94,23 @@ class _EnterDiagnosisState extends State<EnterDiagnosis> {
);
},
onChanged: (value) {
if (value != null) _onTextChanged(value);
},
onFieldSubmitted: () {},
onEditingComplete: (){
if(filteredSearchController.text.isEmpty) return;
_onStopped(filteredSearchController.text);
},
suffixIcon: IconButton(
icon: Icon(
Icons.search,
color: Color(0xff2B353E),
size: 30,
),
onPressed: () {},
onPressed: () {
if(filteredSearchController.text.isEmpty) return;
_onStopped(filteredSearchController.text);
},
),
),
Positioned(

1
lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart
Unescape Escape View File

@ -66,6 +66,7 @@ class _FavoriteDiagnosisState extends State<FavoriteDiagnosis> {
});
},
builder: (_, model, w) => AppScaffold(
isShowAppBar: false,
body: SingleChildScrollView(
child: Padding(
padding:

1
lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart
Unescape Escape View File

@ -29,6 +29,7 @@ class ListOfExamination extends StatelessWidget {
/// the action is [SoapDetailItemActions]
},
status: 'active',
showActions: false,
),
separatorBuilder: (_, __) => Divider(),
itemCount: listOfSelection.length),

9
lib/screens/patients/profile/soap_update_vida_plus/plan/widget/ProgressNoteItem.dart
Unescape Escape View File

@ -7,14 +7,15 @@ class ProgressNoteItem extends StatelessWidget {
final String type;
final String speciality;
final String Notes;
final String status;
// final String status;
const ProgressNoteItem(
{super.key,
required this.type,
required this.speciality,
required this.Notes,
required this.status});
// required this.status
});
@override
Widget build(BuildContext context) => Column(
@ -68,8 +69,8 @@ class ProgressNoteItem extends StatelessWidget {
),
],
),
Align(
alignment: Alignment.topRight, child: Status(status: status))
// Align(
// alignment: Alignment.topRight, child: Status(status: status))
],
),
SizedBox(

2
lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart
Unescape Escape View File

@ -12,7 +12,7 @@ class ListOfNotes extends StatelessWidget{
child: ListView.separated(
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (_, index) =>ProgressNoteItem(type: 'Doctor Note', speciality: "Internal Medicine", Notes: "Some lines of note for the progress ", status: "stable"),
itemBuilder: (_, index) =>ProgressNoteItem(type: notes[index].progressNotesTypesName ?? '', speciality: notes[index].specialityName ?? '', Notes: notes[index].progressNote?? ''),
separatorBuilder: (_, __) => Divider(),
itemCount: notes.length),
);

85
lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart
Unescape Escape View File

@ -84,51 +84,54 @@ class SoapDetailItem extends StatelessWidget {
SizedBox(
height: 16,
),
Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () =>
onSoapDetailActionClicked(SoapDetailItemActions.EDIT),
child: SoapDetailItemActionsView(
icon: 'assets/images/svgs/edit.svg',
fontColor: Color(0XFF2B353E),
text: TranslationBase.of(context).edit,
Visibility(
visible: showActions,
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () =>
onSoapDetailActionClicked(SoapDetailItemActions.EDIT),
child: SoapDetailItemActionsView(
icon: 'assets/images/svgs/edit.svg',
fontColor: Color(0XFF2B353E),
text: TranslationBase.of(context).edit,
),
),
),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () =>
onSoapDetailActionClicked(SoapDetailItemActions.RESOLVE),
child: SoapDetailItemActionsView(
icon: 'assets/images/svgs/resolve.svg',
fontColor: Color(0XFF359846),
text: TranslationBase.of(context).resolve,
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () =>
onSoapDetailActionClicked(SoapDetailItemActions.RESOLVE),
child: SoapDetailItemActionsView(
icon: 'assets/images/svgs/resolve.svg',
fontColor: Color(0XFF359846),
text: TranslationBase.of(context).resolve,
),
),
),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () =>
onSoapDetailActionClicked(SoapDetailItemActions.AUDIT),
child: SoapDetailItemActionsView(
icon: 'assets/images/svgs/audit.svg',
fontColor: Color(0XFF2B353E),
text: TranslationBase.of(context).audit,
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () =>
onSoapDetailActionClicked(SoapDetailItemActions.AUDIT),
child: SoapDetailItemActionsView(
icon: 'assets/images/svgs/audit.svg',
fontColor: Color(0XFF2B353E),
text: TranslationBase.of(context).audit,
),
),
),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () =>
onSoapDetailActionClicked(SoapDetailItemActions.REMOVE),
child: SoapDetailItemActionsView(
icon: 'assets/images/svgs/delete.svg',
fontColor: Color(0XFFD02127),
text: TranslationBase.of(context).delete,
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () =>
onSoapDetailActionClicked(SoapDetailItemActions.REMOVE),
child: SoapDetailItemActionsView(
icon: 'assets/images/svgs/delete.svg',
fontColor: Color(0XFFD02127),
text: TranslationBase.of(context).delete,
),
),
),
],
],
),
)
],
),

Write Preview
Loading…
Cancel
Save