diff --git a/File_Storage/Mzanzi_Innovation_Hub/.minio.sys/buckets/.tracker.bin b/File_Storage/Mzanzi_Innovation_Hub/.minio.sys/buckets/.tracker.bin index df0564fb..a4e96e7a 100644 Binary files a/File_Storage/Mzanzi_Innovation_Hub/.minio.sys/buckets/.tracker.bin and b/File_Storage/Mzanzi_Innovation_Hub/.minio.sys/buckets/.tracker.bin differ diff --git a/Frontend/patient_manager/lib/components/homeAppDrawer.dart b/Frontend/patient_manager/lib/components/homeAppDrawer.dart index c823d469..7f2ed592 100644 --- a/Frontend/patient_manager/lib/components/homeAppDrawer.dart +++ b/Frontend/patient_manager/lib/components/homeAppDrawer.dart @@ -11,6 +11,12 @@ class HomeAppDrawer extends StatefulWidget { } class _HomeAppDrawerState extends State { + @override + void initState() { + // TODO: implement initState + super.initState(); + } + @override Widget build(BuildContext context) { //print(MzanziInnovationHub.of(context)?.theme.mode); @@ -73,6 +79,7 @@ class _HomeAppDrawerState extends State { MzanziInnovationHub.of(context)!.changeTheme(ThemeMode.dark); //print("Dark Mode: $darkm"); } + Navigator.of(context).pushNamed('/home'); }); }, icon: Icon( diff --git a/Frontend/patient_manager/lib/components/homeTile.dart b/Frontend/patient_manager/lib/components/homeTile.dart index 9bc8622a..b8f54c1c 100644 --- a/Frontend/patient_manager/lib/components/homeTile.dart +++ b/Frontend/patient_manager/lib/components/homeTile.dart @@ -7,6 +7,8 @@ class HomeTile extends StatefulWidget { final IconData tileIcon; final void Function() onTap; // final Widget tileIcon; + final Color p; + final Color s; const HomeTile({ super.key, @@ -14,6 +16,8 @@ class HomeTile extends StatefulWidget { required this.tileName, //required this.tileDescription, required this.tileIcon, + required this.p, + required this.s, }); @override @@ -26,12 +30,62 @@ class _HomeTileState extends State { @override void initState() { - mainC = MzanziInnovationHub.of(context)!.theme.secondaryColor(); - secondC = MzanziInnovationHub.of(context)!.theme.primaryColor(); + mainC = widget.p; + secondC = widget.s; super.initState(); } Widget displayTile() { + return FittedBox( + child: Column( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.end, + children: [ + GestureDetector( + onTap: widget.onTap, + onTapDown: (_) { + setState(() { + mainC = MzanziInnovationHub.of(context)!.theme.primaryColor(); + secondC = + MzanziInnovationHub.of(context)!.theme.secondaryColor(); + }); + }, + onTapUp: (_) { + setState(() { + mainC = MzanziInnovationHub.of(context)!.theme.secondaryColor(); + secondC = MzanziInnovationHub.of(context)!.theme.primaryColor(); + }); + }, + child: Container( + padding: const EdgeInsets.all(3.0), + decoration: BoxDecoration( + color: mainC, + borderRadius: BorderRadius.circular(10.0), + //border: Border.all(color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), width: 1.0), + ), + child: Icon( + widget.tileIcon, + color: secondC, + ), + ), + ), + const SizedBox(height: 1), + Text( + widget.tileName, + textAlign: TextAlign.center, + style: TextStyle( + color: mainC, + fontSize: 5.0, + fontWeight: FontWeight.bold, + ), + ) + ], + ), + ); + } + + @override + Widget build(BuildContext context) { return FittedBox( child: Column( mainAxisSize: MainAxisSize.max, @@ -78,11 +132,6 @@ class _HomeTileState extends State { ], ), ); - } - - @override - Widget build(BuildContext context) { - return displayTile(); // child: Card( // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), // elevation: 20, diff --git a/Frontend/patient_manager/lib/components/homeTileGrid.dart b/Frontend/patient_manager/lib/components/homeTileGrid.dart index 5d1d1742..0d528db9 100644 --- a/Frontend/patient_manager/lib/components/homeTileGrid.dart +++ b/Frontend/patient_manager/lib/components/homeTileGrid.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:patient_manager/components/homeTile.dart'; +import 'package:patient_manager/main.dart'; class HomeTileGrid extends StatefulWidget { final String userEmail; @@ -10,21 +11,19 @@ class HomeTileGrid extends StatefulWidget { } class _HomeTileGridState extends State { - @override - Widget build(BuildContext context) { - var size = MediaQuery.of(context).size; + late List> tileList; - double width = size.width; - double height = size.height; - // final double itemHeight = (size.height - kToolbarHeight - 24) / 2; - // final double itemWidth = size.width / 5; - List> tileList = [ + @override + void initState() { + tileList = [ [ Icons.medication, "Patient Manager", () { - Navigator.of(context) - .pushNamed('/patient-manager', arguments: widget.userEmail); + // Navigator.of(context) + // .pushNamed('/patient-manager', arguments: widget.userEmail); + Navigator.popAndPushNamed(context, '/patient-manager', + arguments: widget.userEmail); } ], [Icons.abc, "Test 1", () {}], @@ -34,24 +33,53 @@ class _HomeTileGridState extends State { [Icons.abc, "Test 5", () {}], [Icons.abc, "Test 6", () {}], ]; + super.initState(); + } - return GridView.builder( - padding: EdgeInsets.fromLTRB(width / 6, height / 16, width / 6, - 0), //EdgeInsets.symmetric(horizontal: width / 6), - itemCount: tileList.length, - gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent( - maxCrossAxisExtent: 200), - //const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3), - itemBuilder: (context, index) { - return Padding( - padding: const EdgeInsets.all(10), - child: HomeTile( - onTap: tileList[index][2], - tileIcon: tileList[index][0], - tileName: tileList[index][1], - ), - ); - }, + Color getPrim() { + return MzanziInnovationHub.of(context)!.theme.secondaryColor(); + } + + Color getSec() { + return MzanziInnovationHub.of(context)!.theme.primaryColor(); + } + + Widget buildtile(tile) { + //setColor(); + return Padding( + padding: const EdgeInsets.all(10), + child: HomeTile( + onTap: tile[2], + tileIcon: tile[0], + tileName: tile[1], + p: getPrim(), + s: getSec(), + ), + ); + } + + @override + Widget build(BuildContext context) { + var size = MediaQuery.of(context).size; + double width = size.width; + double height = size.height; + + return Container( + width: width, + height: height, + child: GridView.builder( + padding: EdgeInsets.fromLTRB(width / 6, height / 16, width / 6, + 0), //EdgeInsets.symmetric(horizontal: width / 6), + itemCount: tileList.length, + gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent( + maxCrossAxisExtent: 200), + //const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3), + itemBuilder: (context, index) { + var tile = tileList[index]; + //setState(() {}); + return buildtile(tile); + }, + ), ); } } diff --git a/Frontend/patient_manager/lib/components/patManAppDrawer.dart b/Frontend/patient_manager/lib/components/patManAppDrawer.dart index 28097e7f..be1c81ed 100644 --- a/Frontend/patient_manager/lib/components/patManAppDrawer.dart +++ b/Frontend/patient_manager/lib/components/patManAppDrawer.dart @@ -147,7 +147,8 @@ class _PatManAppDrawerState extends State { ], ), onTap: () { - Navigator.of(context).pushNamed('/home'); + //Navigator.of(context).pushNamed('/home'); + Navigator.popAndPushNamed(context, '/home'); }, ), ListTile( @@ -203,7 +204,8 @@ class _PatManAppDrawerState extends State { ), onTap: () { client.auth.signOut(); - Navigator.of(context).pushNamed('/'); + Navigator.popAndPushNamed(context, '/'); + //Navigator.of(context).pushNamed('/'); }, ) ], diff --git a/Frontend/patient_manager/lib/components/patientFiles.dart b/Frontend/patient_manager/lib/components/patientFiles.dart index fdc97730..13adabcf 100644 --- a/Frontend/patient_manager/lib/components/patientFiles.dart +++ b/Frontend/patient_manager/lib/components/patientFiles.dart @@ -556,81 +556,78 @@ class _PatientFilesState extends State { return const CircularProgressIndicator(); } else if (snapshot.hasData) { final filesList = snapshot.data!; - return Flexible( - flex: 1, - child: Container( - //height: 300.0, - decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - width: 3.0), - ), - child: Padding( - padding: const EdgeInsets.only(top: 5.0), - child: Column(children: [ - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - "Files", - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 25, - fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - ), - ), - IconButton( - onPressed: () { - medCertPopUp(); - }, - icon: Icon( - Icons.sick_outlined, - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - ), - ), - IconButton( - onPressed: () { - prescritionPopUp(); - }, - icon: Icon( - Icons.medication_outlined, - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - ), - ), - IconButton( - onPressed: () { - uploudFilePopUp(); - }, - icon: Icon( - Icons.add, - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - ), - ) - ], - ), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 20.0), - child: Divider( + return Container( + //height: 300.0, + decoration: BoxDecoration( + color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + borderRadius: BorderRadius.circular(25.0), + border: Border.all( + color: + MzanziInnovationHub.of(context)!.theme.secondaryColor(), + width: 3.0), + ), + child: Padding( + padding: const EdgeInsets.only(top: 5.0), + child: Column(children: [ + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + "Files", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 25, + fontWeight: FontWeight.bold, color: MzanziInnovationHub.of(context)! .theme - .secondaryColor()), - ), - const SizedBox(height: 10), - BuildFilesList(files: filesList), - ]), - ), + .secondaryColor(), + ), + ), + IconButton( + onPressed: () { + medCertPopUp(); + }, + icon: Icon( + Icons.sick_outlined, + color: MzanziInnovationHub.of(context)! + .theme + .secondaryColor(), + ), + ), + IconButton( + onPressed: () { + prescritionPopUp(); + }, + icon: Icon( + Icons.medication_outlined, + color: MzanziInnovationHub.of(context)! + .theme + .secondaryColor(), + ), + ), + IconButton( + onPressed: () { + uploudFilePopUp(); + }, + icon: Icon( + Icons.add, + color: MzanziInnovationHub.of(context)! + .theme + .secondaryColor(), + ), + ) + ], + ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 20.0), + child: Divider( + color: MzanziInnovationHub.of(context)! + .theme + .secondaryColor()), + ), + const SizedBox(height: 10), + BuildFilesList(files: filesList), + ]), ), ); } else { diff --git a/Frontend/patient_manager/lib/components/patientNotes.dart b/Frontend/patient_manager/lib/components/patientNotes.dart index 9ff64aff..09cc0485 100644 --- a/Frontend/patient_manager/lib/components/patientNotes.dart +++ b/Frontend/patient_manager/lib/components/patientNotes.dart @@ -226,56 +226,53 @@ class _PatientNotesState extends State { return const CircularProgressIndicator(); } else if (snapshot.hasData) { final notesList = snapshot.data!; - return Flexible( - flex: 1, - child: Container( - //height: 300.0, - decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - width: 3.0), - ), - child: Padding( - padding: const EdgeInsets.only(top: 5.0), - child: Column(children: [ - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - "Notes", - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 25, - fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor()), - ), - IconButton( - onPressed: () { - addNotePopUp(); - }, - icon: Icon(Icons.add, - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor()), - ) - ], - ), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 20.0), - child: Divider( - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor()), - ), - const SizedBox(height: 10), - BuildNotesList(notes: notesList), - ]), - ), + return Container( + //height: 300.0, + decoration: BoxDecoration( + color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + borderRadius: BorderRadius.circular(25.0), + border: Border.all( + color: + MzanziInnovationHub.of(context)!.theme.secondaryColor(), + width: 3.0), + ), + child: Padding( + padding: const EdgeInsets.only(top: 5.0), + child: Column(children: [ + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + "Notes", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 25, + fontWeight: FontWeight.bold, + color: MzanziInnovationHub.of(context)! + .theme + .secondaryColor()), + ), + IconButton( + onPressed: () { + addNotePopUp(); + }, + icon: Icon(Icons.add, + color: MzanziInnovationHub.of(context)! + .theme + .secondaryColor()), + ) + ], + ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 20.0), + child: Divider( + color: MzanziInnovationHub.of(context)! + .theme + .secondaryColor()), + ), + const SizedBox(height: 10), + BuildNotesList(notes: notesList), + ]), ), ); } else { diff --git a/Frontend/patient_manager/lib/components/prescipInput.dart b/Frontend/patient_manager/lib/components/prescipInput.dart index 78b5769f..41514392 100644 --- a/Frontend/patient_manager/lib/components/prescipInput.dart +++ b/Frontend/patient_manager/lib/components/prescipInput.dart @@ -33,6 +33,8 @@ class PrescripInput extends StatefulWidget { class _PrescripInputState extends State { //String perscriptionOutput = ""; List> perscriptionOutput = []; + late double width; + late double height; final numberOptions = [ "0", @@ -260,7 +262,7 @@ class _PrescripInputState extends State { icon: Icon( Icons.delete_forever_outlined, color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzanziInnovationHub.of(context)!.theme.secondaryColor(), ), onPressed: () { setState(() { @@ -307,15 +309,26 @@ class _PrescripInputState extends State { @override Widget build(BuildContext context) { - return SizedBox( - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - displayMedInput(), - displayPerscList(), - ], + var size = MediaQuery.of(context).size; + setState(() { + width = size.width; + height = size.height; + }); + return Container( + //width: , + height: (height / 3) * 2, + child: SingleChildScrollView( + child: Wrap( + direction: Axis.horizontal, + alignment: WrapAlignment.center, + // mainAxisAlignment: MainAxisAlignment.center, + // mainAxisSize: MainAxisSize.max, + // crossAxisAlignment: CrossAxisAlignment.center, + children: [ + displayMedInput(), + displayPerscList(), + ], + ), ), ); } diff --git a/Frontend/patient_manager/lib/pages/home.dart b/Frontend/patient_manager/lib/pages/home.dart index 21adce5c..5d869eab 100644 --- a/Frontend/patient_manager/lib/pages/home.dart +++ b/Frontend/patient_manager/lib/pages/home.dart @@ -3,13 +3,8 @@ import 'package:patient_manager/main.dart'; import 'package:patient_manager/components/homeTileGrid.dart'; import 'package:patient_manager/components/myAppBar.dart'; import 'package:patient_manager/components/homeAppDrawer.dart'; -//import 'package:patient_manager/components/mySuccessMessage.dart'; - -bool darkm = false; class Home extends StatefulWidget { - //final String userEmail; - const Home({ super.key, }); @@ -34,6 +29,18 @@ class _HomeState extends State { return useremail; } + @override + void dispose() { + // TODO: implement dispose + super.dispose(); + } + + @override + void initState() { + // TODO: implement initState + super.initState(); + } + @override Widget build(BuildContext context) { return FutureBuilder( @@ -58,19 +65,12 @@ class _HomeState extends State { // ), // //backgroundColor: Colors.blueAccent, // onPressed: () { - // setState(() { - // if (darkm) { - // darkm = !darkm; - // MzanziInnovationHub.of(context)! - // .changeTheme(ThemeMode.light); - // //print("Dark Mode: $darkm"); - // } else { - // darkm = !darkm; - // MzanziInnovationHub.of(context)! - // .changeTheme(ThemeMode.dark); - // //print("Dark Mode: $darkm"); - // } - // }); + // showDatePicker( + // context: context, + // initialDate: DateTime.now(), + // firstDate: DateTime(2000), + // lastDate: DateTime(2100), + // ); // // showDialog( // // context: context, // // builder: (context) => @@ -83,6 +83,7 @@ class _HomeState extends State { // ), // ), ); + //); } else { return const Center(child: CircularProgressIndicator()); } diff --git a/Frontend/patient_manager/lib/pages/patientAdd.dart b/Frontend/patient_manager/lib/pages/patientAdd.dart index 21d9daf3..dd1d562a 100644 --- a/Frontend/patient_manager/lib/pages/patientAdd.dart +++ b/Frontend/patient_manager/lib/pages/patientAdd.dart @@ -361,7 +361,7 @@ class _AddPatientState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ SizedBox( - width: 400.0, + width: 450.0, height: 100.0, child: MyButton( onTap: () { diff --git a/Frontend/patient_manager/lib/pages/patientEdit.dart b/Frontend/patient_manager/lib/pages/patientEdit.dart index 9d12b109..5212adad 100644 --- a/Frontend/patient_manager/lib/pages/patientEdit.dart +++ b/Frontend/patient_manager/lib/pages/patientEdit.dart @@ -172,8 +172,8 @@ class _EditPatientState extends State { children: [ Container( padding: const EdgeInsets.all(10.0), - width: width / 3, - height: height / 2, + width: 700.0, + height: (height / 3) * 2, decoration: BoxDecoration( color: MzanziInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), @@ -553,7 +553,7 @@ class _EditPatientState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ SizedBox( - width: 400.0, + width: 450.0, height: 100.0, child: MyButton( onTap: () { diff --git a/Frontend/patient_manager/lib/pages/patientView.dart b/Frontend/patient_manager/lib/pages/patientView.dart index 16be9e01..2f525766 100644 --- a/Frontend/patient_manager/lib/pages/patientView.dart +++ b/Frontend/patient_manager/lib/pages/patientView.dart @@ -27,17 +27,24 @@ class _PatientViewState extends State { const SizedBox( height: 10.0, ), - Row( + Wrap( + spacing: 10.0, + runSpacing: 10.0, + direction: Axis.horizontal, + alignment: WrapAlignment.center, children: [ - PatientNotes( - patientIndex: widget.selectedPatient.idpatients, + SizedBox( + width: 725, + child: PatientNotes( + patientIndex: widget.selectedPatient.idpatients, + ), ), - const SizedBox( - width: 10, - ), - PatientFiles( - patientIndex: widget.selectedPatient.idpatients, - selectedPatient: widget.selectedPatient, + SizedBox( + width: 725, + child: PatientFiles( + patientIndex: widget.selectedPatient.idpatients, + selectedPatient: widget.selectedPatient, + ), ) ], ) diff --git a/Frontend/patient_manager/web/index.html b/Frontend/patient_manager/web/index.html index 69f62820..ea323fcb 100644 --- a/Frontend/patient_manager/web/index.html +++ b/Frontend/patient_manager/web/index.html @@ -33,13 +33,9 @@ - + diff --git a/database/#ib_16384_0.dblwr b/database/#ib_16384_0.dblwr index 12d8f6b6..9a657503 100644 Binary files a/database/#ib_16384_0.dblwr and b/database/#ib_16384_0.dblwr differ diff --git a/database/#innodb_redo/#ib_redo18 b/database/#innodb_redo/#ib_redo18 index 5410417a..8f24765e 100644 Binary files a/database/#innodb_redo/#ib_redo18 and b/database/#innodb_redo/#ib_redo18 differ diff --git a/database/#innodb_temp/temp_1.ibt b/database/#innodb_temp/temp_1.ibt index 0fdc5904..1ae8784e 100644 Binary files a/database/#innodb_temp/temp_1.ibt and b/database/#innodb_temp/temp_1.ibt differ diff --git a/database/#innodb_temp/temp_10.ibt b/database/#innodb_temp/temp_10.ibt index 3fbba9dd..d74de676 100644 Binary files a/database/#innodb_temp/temp_10.ibt and b/database/#innodb_temp/temp_10.ibt differ diff --git a/database/#innodb_temp/temp_2.ibt b/database/#innodb_temp/temp_2.ibt index 527f7ee7..428ce7fc 100644 Binary files a/database/#innodb_temp/temp_2.ibt and b/database/#innodb_temp/temp_2.ibt differ diff --git a/database/#innodb_temp/temp_3.ibt b/database/#innodb_temp/temp_3.ibt index 3610fd68..4829ebff 100644 Binary files a/database/#innodb_temp/temp_3.ibt and b/database/#innodb_temp/temp_3.ibt differ diff --git a/database/#innodb_temp/temp_4.ibt b/database/#innodb_temp/temp_4.ibt index dc0b6bc1..67e541a4 100644 Binary files a/database/#innodb_temp/temp_4.ibt and b/database/#innodb_temp/temp_4.ibt differ diff --git a/database/#innodb_temp/temp_5.ibt b/database/#innodb_temp/temp_5.ibt index c425e14a..6d3f70e7 100644 Binary files a/database/#innodb_temp/temp_5.ibt and b/database/#innodb_temp/temp_5.ibt differ diff --git a/database/#innodb_temp/temp_6.ibt b/database/#innodb_temp/temp_6.ibt index 88968703..01f55afc 100644 Binary files a/database/#innodb_temp/temp_6.ibt and b/database/#innodb_temp/temp_6.ibt differ diff --git a/database/#innodb_temp/temp_7.ibt b/database/#innodb_temp/temp_7.ibt index 8a55d1e4..a252baf2 100644 Binary files a/database/#innodb_temp/temp_7.ibt and b/database/#innodb_temp/temp_7.ibt differ diff --git a/database/#innodb_temp/temp_8.ibt b/database/#innodb_temp/temp_8.ibt index 8236c1e5..6cec37c6 100644 Binary files a/database/#innodb_temp/temp_8.ibt and b/database/#innodb_temp/temp_8.ibt differ diff --git a/database/#innodb_temp/temp_9.ibt b/database/#innodb_temp/temp_9.ibt index 98f9ef3b..a2a076b0 100644 Binary files a/database/#innodb_temp/temp_9.ibt and b/database/#innodb_temp/temp_9.ibt differ diff --git a/database/binlog.000056 b/database/binlog.000056 index 2afe789f..daec6267 100644 Binary files a/database/binlog.000056 and b/database/binlog.000056 differ diff --git a/database/binlog.000057 b/database/binlog.000057 new file mode 100644 index 00000000..0036545d Binary files /dev/null and b/database/binlog.000057 differ diff --git a/database/binlog.000058 b/database/binlog.000058 new file mode 100644 index 00000000..bdfcaa3e Binary files /dev/null and b/database/binlog.000058 differ diff --git a/database/ib_buffer_pool b/database/ib_buffer_pool index 6bf00390..be63064a 100644 --- a/database/ib_buffer_pool +++ b/database/ib_buffer_pool @@ -1,4 +1,5 @@ -4294967279,321 +4294967294,448 +4294967278,398 4294967278,397 4294967293,131 4294967293,130 @@ -266,7 +267,6 @@ 4294967278,280 4294967278,413 4294967278,6 -4294967278,428 4294967278,258 4294967278,5 4294967278,389 @@ -294,3 +294,4 @@ 4294967279,449 4294967279,442 4294967279,126 +4294967279,441 diff --git a/database/ibdata1 b/database/ibdata1 index 56a1be4e..8208e08f 100644 Binary files a/database/ibdata1 and b/database/ibdata1 differ diff --git a/database/ibtmp1 b/database/ibtmp1 index 7681f528..fa15d028 100644 Binary files a/database/ibtmp1 and b/database/ibtmp1 differ diff --git a/database/mysql.ibd b/database/mysql.ibd index 9ffc5139..974ecd6f 100644 Binary files a/database/mysql.ibd and b/database/mysql.ibd differ diff --git a/database/patient_manager/patients.ibd b/database/patient_manager/patients.ibd index a2f62ba7..9f40fd80 100644 Binary files a/database/patient_manager/patients.ibd and b/database/patient_manager/patients.ibd differ diff --git a/database/undo_001 b/database/undo_001 index 452e65e8..6e0f6978 100644 Binary files a/database/undo_001 and b/database/undo_001 differ diff --git a/database/undo_002 b/database/undo_002 index ad00193a..12bbc5b9 100644 Binary files a/database/undo_002 and b/database/undo_002 differ