MDS change

lib/screens/patients/profile/admission_request/admission_request_third_screen.dart

@@ -40,6 +40,7 @@ class _AdmissionRequestThirdScreenState extends State<AdmissionRequestThirdScree
   dynamic _selectedDiagnosisType;
   TextEditingController  morphologyController = TextEditingController();
   String diagnosisError = '', icdError = '', diagnosisTypeError = '',stayLengthError = '';
+  dynamic morphologyCode='';
 
   @override
   void initState() {
@@ -185,16 +186,21 @@ class _AdmissionRequestThirdScreenState extends State<AdmissionRequestThirdScree
                               onClick: soapModel.morphologyList.isNotEmpty
                                   ? () {
                                 MasterKeyDailog dialog = MasterKeyDailog(
+                                  isSearch: true,
                                   list: soapModel.morphologyList!,
                                   okText: TranslationBase.of(context).ok,
+
                                   selectedStringValue: "",
                                   okFunction:
                                       (MasterKeyModel selectedValue) {
                                     setState(() {
 
                                       morphologyController.text =
-                                          selectedValue.code;
+                                          selectedValue.nameEn!;
+                                      morphologyCode = selectedValue.id!;
+
                                     });
+
                                   },
                                 );
                                 showDialog(

lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart

@@ -325,7 +325,29 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
                             //         ),
                             //       )
                           ]),
-                          if ((model.morphologyList != null &&
+                              if (widget.mySelectedAssessment.selectedICD != null)
+                                Column(
+                                  children: [
+                                    SizedBox(
+                                      height: 3,
+                                    ),
+                                    Container(
+                                      width:
+                                      MediaQuery.of(context).size.width * 0.7,
+                                      child: AppText(
+                                        widget.mySelectedAssessment.selectedICD!
+                                            .description +
+                                            (' (${widget.mySelectedAssessment.selectedICD!.code} )'),
+                                        color: Color(0xFF575757),
+                                        fontSize: 10,
+                                        fontWeight: FontWeight.w700,
+                                        letterSpacing: -0.4,
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                          SizedBox(height: 10,),
+                          if ((
                                   model.morphologyList.isNotEmpty) ||
                               morphologyController.text.isNotEmpty) ...{
                             AppTextFieldCustom(
@@ -333,6 +355,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
                               onClick: model.morphologyList != null
                                   ? () {
                                       MasterKeyDailog dialog = MasterKeyDailog(
+                                        isSearch:true,
                                         list: model.morphologyList!,
                                         okText: TranslationBase.of(context).ok,
                                         selectedStringValue: widget
@@ -343,9 +366,9 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
                                           setState(() {
                                             widget.mySelectedAssessment
                                                     .morphologyCode =
-                                                selectedValue.code;
+                                                selectedValue.id!.toString();
                                             morphologyController.text =
-                                                selectedValue.code;
+                                                selectedValue.nameEn!;
                                           });
                                         },
                                       );
@@ -375,27 +398,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
                               onFieldSubmitted: () {},
                             ),
                           },
-                          if (widget.mySelectedAssessment.selectedICD != null)
+
-                            Column(
-                              children: [
-                                SizedBox(
-                                  height: 3,
-                                ),
-                                Container(
-                                  width:
-                                      MediaQuery.of(context).size.width * 0.7,
-                                  child: AppText(
-                                    widget.mySelectedAssessment.selectedICD!
-                                            .description +
-                                        (' (${widget.mySelectedAssessment.selectedICD!.code} )'),
-                                    color: Color(0xFF575757),
-                                    fontSize: 10,
-                                    fontWeight: FontWeight.w700,
-                                    letterSpacing: -0.4,
-                                  ),
-                                ),
-                              ],
-                            ),
                           SizedBox(
                             height: 7,
                           ),
@@ -596,6 +599,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
                 prevIcdCode10ID: mySelectedAssessment.icdCode10ID,
                 diagnosisTypeId: mySelectedAssessment.selectedDiagnosisType!.id,
                 icdcode10Id: mySelectedAssessment.selectedICD!.code,
+
               //todo will update the morphology here
             )
           ]);

lib/widgets/shared/dialogs/master_key_dailog.dart

@@ -2,6 +2,7 @@ import 'package:doctor_app_flutter/config/size_config.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
+import 'package:doctor_app_flutter/utils/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
@@ -15,17 +16,20 @@ class MasterKeyDailog extends StatefulWidget {
   MasterKeyModel? selectedValue;
   String? selectedStringValue;
   final bool isICD;
-
+  final bool isSearch;
-  MasterKeyDailog({required this.list, required this.okText, required this.okFunction, this.selectedValue, this.isICD = false, this.selectedStringValue});
+  MasterKeyDailog({required this.list, required this.okText, required this.okFunction, this.selectedValue, this.isICD = false, this.selectedStringValue, this.isSearch =false});
 
   @override
   _MasterKeyDailogState createState() => _MasterKeyDailogState();
 }
 
 class _MasterKeyDailogState extends State<MasterKeyDailog> {
+  List<MasterKeyModel> items = [];
+
   @override
   void initState() {
     super.initState();
+    items.addAll(widget.list);
     widget.selectedValue = widget.selectedValue ?? widget.list.first;
   }
 
@@ -74,6 +78,20 @@ class _MasterKeyDailogState extends State<MasterKeyDailog> {
       child: SingleChildScrollView(
         child: Column(
           children: [
+            if (widget.isSearch)
+              Container(
+                  height: MediaQuery.of(context).size.height * 0.070,
+                  child: TextField(
+                    decoration: Utils.textFieldSelectorDecoration(TranslationBase.of(context).search, "", false,
+                        suffixIcon: Icon(
+                          Icons.search,
+                        )),
+                    enabled: true,
+                    keyboardType: TextInputType.text,
+                    onChanged: (value) {
+                      filterSearchResults(value, projectViewModel);
+                    },
+                  )),
             ...widget.list
                 .map((item) => RadioListTile(
                       title: AppText(
@@ -99,4 +117,27 @@ class _MasterKeyDailogState extends State<MasterKeyDailog> {
   static closeAlertDialog(BuildContext context) {
     Navigator.of(context).pop();
   }
+
+  void filterSearchResults(String query,ProjectViewModel projectViewModel ) {
+    List<MasterKeyModel> dummySearchList = [];
+    dummySearchList.addAll(widget.list);
+    if (query.isNotEmpty) {
+      List<MasterKeyModel> dummyListData = [];
+      dummySearchList.forEach((item) {
+        if ((projectViewModel.isArabic ? item.nameAr : item.nameEn! + (widget.isICD ? '/${item.code}' : ''))!.toLowerCase().contains(query.toLowerCase())) {
+          dummyListData.add(item);
+        }
+      });
+      setState(() {
+        items.clear();
+        items.addAll(dummyListData);
+      });
+      return;
+    } else {
+      setState(() {
+        items.clear();
+        items.addAll(widget.list);
+      });
+    }
+  }
 }