From fe695de487051078fef72b72db1c46a8eabeaca1 Mon Sep 17 00:00:00 2001
From: Sven Frotscher <sven.frotscher+gitea.presley.nz@gmail.com>
Date: Tue, 16 Jan 2024 12:13:23 +0100
Subject: [PATCH 1/2] Add leading zeros to minute and day of month fields

---
 SettingsPage.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/SettingsPage.tsx b/SettingsPage.tsx
index ef8382f..fdb6721 100644
--- a/SettingsPage.tsx
+++ b/SettingsPage.tsx
@@ -34,12 +34,12 @@ const twelveHours = [
 
 const twentyFours = [
   "dd/LL/yyyy",
-  "dd/LL/yyyy, k:m",
-  "ccc k:m",
-  "k:m",
-  "yyyy-MM-d",
-  "yyyy-MM-d, k:m",
-  "yyyy.MM.d",
+  "dd/LL/yyyy, k:mm",
+  "ccc k:mm",
+  "k:mm",
+  "yyyy-MM-dd",
+  "yyyy-MM-dd, k:mm",
+  "yyyy.MM.dd",
 ];
 
 interface Item {

From 426c5570196a7ca474ff3029d702fea9e7c956f8 Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Mon, 5 Feb 2024 14:24:53 +1300
Subject: [PATCH 2/2] Add migrations to leading zeros for date settings

Also included the 12-hour formats for leading zeros.
---
 App.tsx                                   |  2 ++
 SettingsPage.tsx                          |  6 ++--
 data-source.ts                            |  2 ++
 migrations/1707094662099-leading-zeros.ts | 39 +++++++++++++++++++++++
 4 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 migrations/1707094662099-leading-zeros.ts

diff --git a/App.tsx b/App.tsx
index a0065cb..ba82390 100644
--- a/App.tsx
+++ b/App.tsx
@@ -18,6 +18,7 @@ import { AppDataSource } from "./data-source";
 import { settingsRepo } from "./db";
 import { ThemeContext } from "./use-theme";
 import TimerProgress from "./TimerProgress";
+import { MigrationExecutor } from "typeorm";
 
 export const CombinedDefaultTheme = {
   ...NavigationDefaultTheme,
@@ -53,6 +54,7 @@ const App = () => {
     (async () => {
       if (!AppDataSource.isInitialized)
         await AppDataSource.initialize().catch((e) => setError(e.toString()));
+
       const gotSettings = await settingsRepo.findOne({ where: {} });
       console.log({ gotSettings });
       setAppSettings({
diff --git a/SettingsPage.tsx b/SettingsPage.tsx
index fdb6721..6f55029 100644
--- a/SettingsPage.tsx
+++ b/SettingsPage.tsx
@@ -27,9 +27,9 @@ const twelveHours = [
   "dd/LL/yyyy, p",
   "ccc p",
   "p",
-  "yyyy-MM-d",
-  "yyyy-MM-d, p",
-  "yyyy.MM.d",
+  "yyyy-MM-dd",
+  "yyyy-MM-dd, p",
+  "yyyy.MM.dd",
 ];
 
 const twentyFours = [
diff --git a/data-source.ts b/data-source.ts
index 1c18c7e..3bc39d2 100644
--- a/data-source.ts
+++ b/data-source.ts
@@ -39,6 +39,7 @@ import Settings from "./settings";
 import Weight from "./weight";
 import { settingsDefaultSets1700009253976 } from "./migrations/1700009253976-settings-default-sets";
 import { settingsDefaults1700009729468 } from "./migrations/1700009729468-settings-defaults";
+import { leadingZeros1707094662099 } from "./migrations/1707094662099-leading-zeros";
 
 export const AppDataSource = new DataSource({
   type: "react-native",
@@ -84,5 +85,6 @@ export const AppDataSource = new DataSource({
     autoConvert1699948105001,
     settingsDefaultSets1700009253976,
     settingsDefaults1700009729468,
+    leadingZeros1707094662099,
   ],
 });
diff --git a/migrations/1707094662099-leading-zeros.ts b/migrations/1707094662099-leading-zeros.ts
new file mode 100644
index 0000000..e124349
--- /dev/null
+++ b/migrations/1707094662099-leading-zeros.ts
@@ -0,0 +1,39 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+import { settingsRepo } from "../db";
+
+export class leadingZeros1707094662099 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    const settings = await settingsRepo.find();
+    const setting = settings[0];
+    console.log(`Going from date: ${setting.date}`);
+
+    switch (setting.date) {
+      case "dd/LL/yyyy, k:m":
+        setting.date = "dd/LL/yyyy, k:mm";
+        break;
+      case "ccc k:m":
+        setting.date = "ccc k:mm";
+        break;
+      case "k:m":
+        setting.date = "k:mm";
+        break;
+      case "yyyy-MM-d, p":
+        setting.date = "yyyy-MM-dd, p";
+        break;
+      case "yyyy-MM-d":
+        setting.date = "yyyy-MM-dd";
+        break;
+      case "yyyy-MM-d, k:m":
+        setting.date = "yyyy-MM-dd, k:mm";
+        break;
+      case "yyyy.MM.d":
+        setting.date = "yyyy.MM.dd";
+        break;
+    }
+
+    console.log(`To date: ${setting.date}`);
+    await settingsRepo.save(setting);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {}
+}