diff --git a/Frontend/patient_manager/lib/components/patientDetails.dart b/Frontend/patient_manager/lib/components/patientDetails.dart index 26d243c3..d82312ae 100644 --- a/Frontend/patient_manager/lib/components/patientDetails.dart +++ b/Frontend/patient_manager/lib/components/patientDetails.dart @@ -50,152 +50,151 @@ class _PatientDetailsState extends State { @override Widget build(BuildContext context) { return Container( - padding: const EdgeInsets.all(20), + padding: const EdgeInsets.only(left: 20, right: 20, bottom: 10), decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.circular(25.0), border: Border.all(color: Colors.blueAccent, width: 3.0), ), //constraints: const BoxConstraints.expand(height: 250.0), - child: SelectionArea( - child: Column( - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Text( - "Patient Details", - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 35, - fontWeight: FontWeight.bold, - color: Colors.blueAccent, - ), - ), - IconButton( - icon: const Icon(Icons.edit), - alignment: Alignment.topRight, + child: Column( + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.center, + //crossAxisAlignment: , + children: [ + const Text( + "Patient Details", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 25, + fontWeight: FontWeight.bold, color: Colors.blueAccent, - onPressed: () { - Navigator.of(context).pushNamed( - '/patient-manager/patient/edit', - arguments: widget.selectedPatient); - }, - ) - ], - ), - const Divider(color: Colors.blueAccent), - const SizedBox(height: 10), - Column( - children: [ - Row( - children: [ - Expanded( - child: MyTextField( - controller: idController, - hintText: "ID No.", - editable: false, - required: false), - ), - Expanded( - child: MyTextField( - controller: fnameController, - hintText: "Name", - editable: false, - required: false), - ), - Expanded( - child: MyTextField( - controller: lnameController, - hintText: "Surname", - editable: false, - required: false), - ), - ], ), - const SizedBox(height: 10), - Row( - children: [ - Expanded( - child: MyTextField( - controller: cellController, - hintText: "Cell No.", - editable: false, - required: false), - ), - Expanded( - child: MyTextField( - controller: emailController, - hintText: "Email", - editable: false, - required: false), - ), - Expanded( - child: MyTextField( - controller: addressController, - hintText: "Address", - editable: false, - required: false), - ), - ], - ), - ], - ), - const SizedBox(height: 10), - const Text( - "Medical Aid Details", - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 25, - fontWeight: FontWeight.bold, - color: Colors.blueAccent, ), + IconButton( + icon: const Icon(Icons.edit), + alignment: Alignment.topRight, + color: Colors.blueAccent, + onPressed: () { + Navigator.of(context).pushNamed( + '/patient-manager/patient/edit', + arguments: widget.selectedPatient); + }, + ) + ], + ), + const Divider(color: Colors.blueAccent), + const SizedBox(height: 10), + Column( + children: [ + Row( + children: [ + Expanded( + child: MyTextField( + controller: idController, + hintText: "ID No.", + editable: false, + required: false), + ), + Expanded( + child: MyTextField( + controller: fnameController, + hintText: "Name", + editable: false, + required: false), + ), + Expanded( + child: MyTextField( + controller: lnameController, + hintText: "Surname", + editable: false, + required: false), + ), + ], + ), + const SizedBox(height: 10), + Row( + children: [ + Expanded( + child: MyTextField( + controller: cellController, + hintText: "Cell No.", + editable: false, + required: false), + ), + Expanded( + child: MyTextField( + controller: emailController, + hintText: "Email", + editable: false, + required: false), + ), + Expanded( + child: MyTextField( + controller: addressController, + hintText: "Address", + editable: false, + required: false), + ), + ], + ), + ], + ), + const SizedBox(height: 10), + const Text( + "Medical Aid Details", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 25, + fontWeight: FontWeight.bold, + color: Colors.blueAccent, ), - const Divider(color: Colors.blueAccent), - const SizedBox(height: 10), - Column( - children: [ - Row( - children: [ - Expanded( - child: MyTextField( - controller: medNoController, - hintText: "No.", - editable: false, - required: false), - ), - Expanded( - child: MyTextField( - controller: medNameController, - hintText: "Name", - editable: false, - required: false), - ), - Expanded( - child: MyTextField( - controller: medSchemeController, - hintText: "Scheme", - editable: false, - required: false), - ), - // PatientDetailItem( - // category: "No. ", - // value: widget.selectedPatient.medical_aid_no, - // ), - // PatientDetailItem( - // category: "Name ", - // value: widget.selectedPatient.medical_aid_name, - // ), - // PatientDetailItem( - // category: "Scheme ", - // value: widget.selectedPatient.medical_aid_scheme, - // ), - ], - ), - ], - ) - ], - ), + ), + const Divider(color: Colors.blueAccent), + const SizedBox(height: 10), + Column( + children: [ + Row( + children: [ + Expanded( + child: MyTextField( + controller: medNoController, + hintText: "No.", + editable: false, + required: false), + ), + Expanded( + child: MyTextField( + controller: medNameController, + hintText: "Name", + editable: false, + required: false), + ), + Expanded( + child: MyTextField( + controller: medSchemeController, + hintText: "Scheme", + editable: false, + required: false), + ), + // PatientDetailItem( + // category: "No. ", + // value: widget.selectedPatient.medical_aid_no, + // ), + // PatientDetailItem( + // category: "Name ", + // value: widget.selectedPatient.medical_aid_name, + // ), + // PatientDetailItem( + // category: "Scheme ", + // value: widget.selectedPatient.medical_aid_scheme, + // ), + ], + ), + ], + ) + ], ), ); } diff --git a/Frontend/patient_manager/lib/components/patientFiles.dart b/Frontend/patient_manager/lib/components/patientFiles.dart index c78cb011..30b6a909 100644 --- a/Frontend/patient_manager/lib/components/patientFiles.dart +++ b/Frontend/patient_manager/lib/components/patientFiles.dart @@ -553,7 +553,7 @@ class _PatientFilesState extends State { "Files", textAlign: TextAlign.center, style: TextStyle( - fontSize: 35, + fontSize: 25, fontWeight: FontWeight.bold, color: Colors.blueAccent, ), @@ -589,7 +589,7 @@ class _PatientFilesState extends State { ), const Padding( padding: EdgeInsets.symmetric(horizontal: 20.0), - child: Divider(), + child: Divider(color: Colors.blueAccent), ), const SizedBox(height: 10), BuildFilesList(files: filesList), diff --git a/Frontend/patient_manager/lib/components/patientNotes.dart b/Frontend/patient_manager/lib/components/patientNotes.dart index 7c0db6f0..8808642b 100644 --- a/Frontend/patient_manager/lib/components/patientNotes.dart +++ b/Frontend/patient_manager/lib/components/patientNotes.dart @@ -238,7 +238,7 @@ class _PatientNotesState extends State { "Notes", textAlign: TextAlign.center, style: TextStyle( - fontSize: 35, + fontSize: 25, fontWeight: FontWeight.bold, color: Colors.blueAccent), ), @@ -252,7 +252,7 @@ class _PatientNotesState extends State { ), const Padding( padding: EdgeInsets.symmetric(horizontal: 20.0), - child: Divider(), + child: Divider(color: Colors.blueAccent), ), const SizedBox(height: 10), BuildNotesList(notes: notesList),