palladiumkenya · vicky-ogutu · Jul 16, 2024 · Jul 23, 2024 · Jul 23, 2024 · Jul 23, 2024
diff --git a/lib/src/features/clinic_card/presentation/pages/ClinicCardScreen.dart b/lib/src/features/clinic_card/presentation/pages/ClinicCardScreen.dart
@@ -109,52 +109,67 @@ class ClinicCardScreen extends HookConsumerWidget {
         }
 
         return Scaffold(
-          body: Column(
-            children: [
-              const CustomAppBar(
-                title: "My Clinic Card 👨🏾‍💼",
-                color: Constants.clinicCardBgColor,
-                subTitle: "Access all your medical details",
-                svgPathGroup: "assets/images/group_clinic_card.svg",
-              ),
-              Expanded(
-                child: SingleChildScrollView(
-                    child: Stack(
-                      alignment: AlignmentDirectional.center,
-                      children: [
-                        Padding(
-                          padding: const EdgeInsets.all(10.0),
-                          child: Column(
-                            // crossAxisAlignment: CrossAxisAlignment.start,
-                            mainAxisAlignment: MainAxisAlignment.start,
-                            children: [
-                              Row(
-                                  children: [Text("Health Records", style: theme.textTheme.titleMedium),
-                                  ]
-                              ),
-                              const SizedBox(height: 10),
-                              ItemList(items: items, path: paths, svgAsset: icons),
-                              const SizedBox(height: 10),
-                              Row(
-                                  children: [Text("Shared With Me", style: theme.textTheme.titleMedium),
-                                  ]
-                              ),
-                              const ItemList(items: ["Eric Muthomi"], svgAsset: ["assets/images/clinicCardCard.svg"],path: [RouteNames.MY_DEPENDANT_CLINIC_CARD], color: Constants.clinicCardBgColor, relationship: ["Next of Kin"],),
-                            ],
+          body: SingleChildScrollView(
+            child: Column(
+              children: [
+                const CustomAppBar(
+                  title: "My Clinic Card 👨🏾‍💼",
+                  color: Constants.clinicCardBgColor,
+                  subTitle: "Access all your medical details",
+                  svgPathGroup: "assets/images/group_clinic_card.svg",
+                ),
+                Padding(
+                  padding: const EdgeInsets.all(10.0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Row(
+                        children: [
+                          Expanded(
+                            child: Text(
+                              "Health Records",
+                              style: theme.textTheme.titleMedium,
+                              overflow: TextOverflow.ellipsis, // Prevents text overflow.
+                              maxLines: 1,
+                            ),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 10),
+                      ItemList(items: items, path: paths, svgAsset: icons),
+                      const SizedBox(height: 10),
+                      Row(
+                        children: [
+                          Expanded(
+                            child: Text(
+                              "Shared With Me",
+                              style: theme.textTheme.titleMedium,
+                              overflow: TextOverflow.ellipsis, // Prevents overflow.
+                              maxLines: 1,
+                            ),
                           ),
-                        ),
-                      ],
-                    )
+                        ],
+                      ),
+                      const ItemList(
+                        items: ["Eric Muthomi"],
+                        svgAsset: ["assets/images/clinicCardCard.svg"],
+                        path: [RouteNames.MY_DEPENDANT_CLINIC_CARD],
+                        color: Constants.clinicCardBgColor,
+                        relationship: ["Next of Kin"],
+                      ),
+                    ],
+                  ),
                 ),
-              ),
-            ],
+              ],
+            ),
           ),
           floatingActionButton: FloatingActionButton(
             onPressed: _reloadData,
             child: const Icon(Icons.refresh),
             tooltip: 'Refresh Data',
           ),
         );
+
       },
       error: (error, _) => _buildErrorState(context, error.toString(), _reloadData),
       loading: () => _buildLoadingState(context, theme),

diff --git a/lib/src/features/clinic_card/presentation/widgets/allergy_records.dart b/lib/src/features/clinic_card/presentation/widgets/allergy_records.dart
@@ -128,9 +128,9 @@ class _VisitHealthRecord extends State<AllergyHealthRecord> {
       children: [
         _buildDateRow(record.visitDate, theme),
         const SizedBox(height: Constants.SPACING),
-        _buildHospitalRow(record.facility, theme),
-        const SizedBox(height: Constants.SPACING),
-        const Divider(),
+        // _buildHospitalRow(record.facility, theme),
+        // const SizedBox(height: Constants.SPACING),
+        // const Divider(),
         _buildAllergyList(record.allergies, theme),
         const SizedBox(height: Constants.SPACING),
         const Divider(),

diff --git a/lib/src/features/clinic_card/presentation/widgets/condition_records.dart b/lib/src/features/clinic_card/presentation/widgets/condition_records.dart
@@ -130,9 +130,9 @@ class _ConditionHealthRecordState extends State<ConditionHealthRecord> {
       children: [
         _buildDateRow(record.visitDate, theme),
         const SizedBox(height: Constants.SPACING),
-        _buildHospitalRow(record.facility, theme),
-        const SizedBox(height: Constants.SPACING),
-        const Divider(),
+        // _buildHospitalRow(record.facility, theme),
+        // const SizedBox(height: Constants.SPACING),
+        // const Divider(),
         _buildConditionList(record.conditions, theme),
         const SizedBox(height: Constants.SPACING),
         const Divider(),

diff --git a/lib/src/features/clinic_card/presentation/widgets/immunization.dart b/lib/src/features/clinic_card/presentation/widgets/immunization.dart
@@ -136,10 +136,10 @@ class _ImmunizationTestState extends State<ImmunizationTest> {
     return Column(
       children: [
         _buildDateRow(record.visitDate, theme),
-       // const SizedBox(height: Constants.SPACING),
-        //_buildHospitalRow(record.facility, theme),
         const SizedBox(height: Constants.SPACING),
-        //const Divider(),
+        // _buildHospitalRow(record.facility, theme),
+        // const SizedBox(height: Constants.SPACING),
+        // const Divider(),
         _buildConditionList(record.immunizations, theme),
         const SizedBox(height: Constants.SPACING),
         const Divider(),

diff --git a/lib/src/features/clinic_card/presentation/widgets/lab_result_records.dart b/lib/src/features/clinic_card/presentation/widgets/lab_result_records.dart
@@ -128,9 +128,9 @@ class _LabResultHealthRecord extends State<LabResultHealthRecord> {
       children: [
         _buildDateRow(record.visitDate, theme),
         const SizedBox(height: Constants.SPACING),
-        _buildHospitalRow(record.facility, theme),
-        const SizedBox(height: Constants.SPACING),
-        const Divider(),
+        // _buildHospitalRow(record.facility, theme),
+        // const SizedBox(height: Constants.SPACING),
+        // const Divider(),
         _buildConditionList(record.labResults, theme),
         const SizedBox(height: Constants.SPACING),
         const Divider(),

diff --git a/lib/src/features/clinic_card/presentation/widgets/medication.dart b/lib/src/features/clinic_card/presentation/widgets/medication.dart
@@ -137,9 +137,9 @@ class _MedicationRecordState extends State<MedicationRecord> {
       children: [
         _buildDateRow(record.visitDate, theme),
         const SizedBox(height: Constants.SPACING),
-        _buildHospitalRow(record.facility, theme),
-        const SizedBox(height: Constants.SPACING),
-        const Divider(),
+        // _buildHospitalRow(record.facility, theme),
+        // const SizedBox(height: Constants.SPACING),
+        // const Divider(),
         _buildMedicationList(record.medications, theme),
         const SizedBox(height: Constants.SPACING),
         const Divider(),

diff --git a/lib/src/features/clinic_card/presentation/widgets/vital_records.dart b/lib/src/features/clinic_card/presentation/widgets/vital_records.dart
@@ -127,9 +127,9 @@ class _VitalHealthRecord extends State<VitalHealthRecord> {
       children: [
         _buildDateRow(record.visitDate, theme),
         const SizedBox(height: Constants.SPACING),
-        _buildHospitalRow(record.facility, theme),
-        const SizedBox(height: Constants.SPACING),
-        const Divider(),
+        // _buildHospitalRow(record.facility, theme),
+        // const SizedBox(height: Constants.SPACING),
+        // const Divider(),
         _buildVitalList(record.vitals, theme),
         const SizedBox(height: Constants.SPACING),
         const Divider(),

diff --git a/lib/src/features/clinic_card/relationship/widgets/allergy_rship_records.dart b/lib/src/features/clinic_card/relationship/widgets/allergy_rship_records.dart
@@ -129,9 +129,9 @@ class _AllergyRshipRecordState extends State<AllergyRshipRecord> {
       children: [
         _buildDateRow(record.visitDate, theme),
         const SizedBox(height: Constants.SPACING),
-        _buildHospitalRow(record.facility, theme),
-        const SizedBox(height: Constants.SPACING),
-        const Divider(),
+        // _buildHospitalRow(record.facility, theme),
+        // const SizedBox(height: Constants.SPACING),
+        // const Divider(),
         _buildAllergyList(record.allergies, theme),
         const SizedBox(height: Constants.SPACING),
         const Divider(),

diff --git a/lib/src/features/clinic_card/relationship/widgets/condition_rship.dart b/lib/src/features/clinic_card/relationship/widgets/condition_rship.dart
@@ -130,9 +130,9 @@ class _ConditionRshipState extends State<ConditionRship> {
       children: [
         _buildDateRow(record.visitDate, theme),
         const SizedBox(height: Constants.SPACING),
-        _buildHospitalRow(record.facility, theme),
-        const SizedBox(height: Constants.SPACING),
-        const Divider(),
+        // _buildHospitalRow(record.facility, theme),
+        // const SizedBox(height: Constants.SPACING),
+        // const Divider(),
         _buildConditionList(record.conditions, theme),
         const SizedBox(height: Constants.SPACING),
         const Divider(),

diff --git a/lib/src/features/clinic_card/relationship/widgets/immunization_rship.dart b/lib/src/features/clinic_card/relationship/widgets/immunization_rship.dart
@@ -142,10 +142,10 @@ class _ImmunizationRshipState extends State<ImmunizationRship> {
     return Column(
       children: [
         _buildDateRow(record.visitDate, theme),
+         const SizedBox(height: Constants.SPACING),
+        // _buildHospitalRow(record.facility, theme),
         // const SizedBox(height: Constants.SPACING),
-        //_buildHospitalRow(record.facility, theme),
-        const SizedBox(height: Constants.SPACING),
-        //const Divider(),
+        // const Divider(),
         _buildConditionList(record.immunizations, theme),
         const SizedBox(height: Constants.SPACING),
         const Divider(),

diff --git a/lib/src/features/clinic_card/relationship/widgets/lab_rship.dart b/lib/src/features/clinic_card/relationship/widgets/lab_rship.dart
@@ -127,9 +127,9 @@ class _LabRshpRecordState extends State<LabRshpRecord> {
       children: [
         _buildDateRow(record.visitDate, theme),
         const SizedBox(height: Constants.SPACING),
-        _buildHospitalRow(record.facility, theme),
-        const SizedBox(height: Constants.SPACING),
-        const Divider(),
+        // _buildHospitalRow(record.facility, theme),
+        // const SizedBox(height: Constants.SPACING),
+        // const Divider(),
         _buildConditionList(record.labResults, theme),
         const SizedBox(height: Constants.SPACING),
         const Divider(),

diff --git a/lib/src/features/clinic_card/relationship/widgets/medication_rship.dart b/lib/src/features/clinic_card/relationship/widgets/medication_rship.dart
@@ -135,9 +135,9 @@ class _MedicationRshipState extends State<MedicationRship> {
       children: [
         _buildDateRow(record.visitDate, theme),
         const SizedBox(height: Constants.SPACING),
-        _buildHospitalRow(record.facility, theme),
-        const SizedBox(height: Constants.SPACING),
-        const Divider(),
+        // _buildHospitalRow(record.facility, theme),
+        // const SizedBox(height: Constants.SPACING),
+        // const Divider(),
         _buildMedicationList(record.medications, theme),
         const SizedBox(height: Constants.SPACING),
         const Divider(),

diff --git a/lib/src/features/clinic_card/relationship/widgets/vital_rship_records.dart b/lib/src/features/clinic_card/relationship/widgets/vital_rship_records.dart
@@ -127,9 +127,9 @@ class _VitalHealthRshipRecordState extends State<VitalHealthRshipRecord> {
       children: [
         _buildDateRow(record.visitDate, theme),
         const SizedBox(height: Constants.SPACING),
-        _buildHospitalRow(record.facility, theme),
-        const SizedBox(height: Constants.SPACING),
-        const Divider(),
+        // _buildHospitalRow(record.facility, theme),
+        // const SizedBox(height: Constants.SPACING),
+        // const Divider(),
         _buildVitalList(record.vitals, theme),
         const SizedBox(height: Constants.SPACING),
         const Divider(),

diff --git a/lib/src/features/self_screening/blood_sugar/presentation/pages/BloodSugarScreen.dart b/lib/src/features/self_screening/blood_sugar/presentation/pages/BloodSugarScreen.dart
@@ -175,7 +175,8 @@ class _BloodSugarScreenState extends ConsumerState<BloodSugarScreen> {
   Row _buildLastRecordRow(displayedData, ThemeData theme) {
     return Row(
       children: [
-        Text("Last Record Date:", style: theme.textTheme.bodyLarge),
+        Expanded(
+        child:Text("Last Record Date:", style: theme.textTheme.bodyLarge),),
         const SizedBox(width: 4),
         Text(DateFormat('dd MMM yyyy').format(displayedData.created_at), style: theme.textTheme.bodyLarge!.copyWith(color: Colors.grey, fontWeight: FontWeight.bold)),
       ],
@@ -213,12 +214,22 @@ class _BloodSugarScreenState extends ConsumerState<BloodSugarScreen> {
         child: ListTile(
           title: Row(
             children: [
-              Text(
-                'Your Blood Sugar Levels are ',
-                style: theme.textTheme.bodyLarge!.copyWith(fontWeight: FontWeight.w600),
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start, // Align to the start of the column
+                children: [
+                  Text(
+                    'Your Blood Sugar Levels are',
+                    style: theme.textTheme.bodyMedium!.copyWith(fontWeight: FontWeight.w600),
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                  const SizedBox(height: 4), // Add spacing between the lines
+                  Text(
+                    status,
+                    style: theme.textTheme.bodyMedium!.copyWith(color: Colors.green),
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                ],
               ),
-              const SizedBox(width: 4),
-              Text(status, style: theme.textTheme.bodyLarge!.copyWith(color: Colors.green)),
             ],
           ),
           subtitle: Text(advice, style: theme.textTheme.bodyMedium),

diff --git a/lib/src/features/self_screening/blood_sugar/presentation/pages/bs_line_list_Screen.dart b/lib/src/features/self_screening/blood_sugar/presentation/pages/bs_line_list_Screen.dart
@@ -105,6 +105,7 @@ class BloodSugarRecords extends StatelessWidget {
                     child: Container(
                       color: Constants.bgColor,
                       child: ListView.builder(
+                        shrinkWrap: true,
                         itemCount: data.length,
                         itemBuilder: (context, index) {
                           final bs = data[index];
@@ -118,33 +119,36 @@ class BloodSugarRecords extends StatelessWidget {
                                   height: 20,
                                 ),
                                 title: ExpansionTile(
-                                  title: Row(
+                                  title:Row(
                                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                     children: [
-                                      RichText(
+                                      Expanded( // Wrap RichText with Expanded
+                                        child: RichText(
                                           text: TextSpan(
                                             children: [
                                               TextSpan(
                                                 text: '${_convertToMMOL(bs.level)}',
-                                                style: theme.textTheme.titleMedium!.copyWith(color: _getStatusColor(status))
+                                                style: theme.textTheme.titleMedium!
+                                                    .copyWith(color: _getStatusColor(status)),
                                               ),
-
                                               TextSpan(
                                                 text: ' mmol/L',
-                                                style: theme.textTheme.titleSmall
+                                                style: theme.textTheme.titleSmall,
                                               ),
-                                            ]
-                                          )
+                                            ],
+                                          ),
+                                        ),
                                       ),
-                                      // Text(
-                                      //   "${bs.level}",
-                                      //   style: theme.textTheme.titleMedium,
-                                      // ),
                                       Text(
-                                        DateFormat('dd MMM yy HH:mm').format(DateTime.parse(bs.created_at.toString()),), style: theme.textTheme.bodyMedium!.copyWith(color: Colors.grey),
+                                        DateFormat('dd MMM yy HH:mm').format(
+                                          DateTime.parse(bs.created_at.toString()),
+                                        ),
+                                        style: theme.textTheme.bodyMedium!.copyWith(color: Colors.grey),
+                                        overflow: TextOverflow.ellipsis, // Add ellipsis if text is too long
                                       ),
                                     ],
                                   ),
+
                                   children: <Widget>[
                                     ListTile(
                                       title: bs.condition != null && bs.condition!.isNotEmpty

diff --git a/lib/src/features/self_screening/bp/presentation/pages/BPLinelistScreen.dart b/lib/src/features/self_screening/bp/presentation/pages/BPLinelistScreen.dart
@@ -56,6 +56,7 @@ class BloodPressureRecords extends StatelessWidget {
                     child: Container(
                       color: Constants.bgColor,
                       child: ListView.builder(
+                        shrinkWrap: true,
                         itemCount: data.length,
                         itemBuilder: (context, index) {
                           final bp = data[index];
@@ -71,12 +72,16 @@ class BloodPressureRecords extends StatelessWidget {
                                   title: Row(
                                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                     children: [
-                                      Text(
+                                      Expanded(
+                                    child:  Text(
                                         "${bp.systolic}/${bp.diastolic}",
-                                        style: theme.textTheme.titleMedium,
+                                        style: theme.textTheme.titleSmall,
+                                      ),
                                       ),
                                       Text(
-                                        DateFormat('dd MMM yy HH:mm').format(DateTime.parse(bp.created_at.toString()),), style: theme.textTheme.bodyMedium!.copyWith(color: Colors.grey),
+                                        DateFormat('dd MMM yy HH:mm').format(DateTime.parse(bp.created_at.toString()),),
+                                        style: theme.textTheme.bodyMedium!.copyWith(color: Colors.grey),
+                                        overflow: TextOverflow.ellipsis,
                                       ),
                                     ],
                                   ),