Merge pull request 'Add leading zeros to minute and day of month fields' (#219) from svenf/Massive:fix-date-format into master - 2.10 🚀

Reviewed-on: #219

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({

SettingsPage.tsx

@@ -27,19 +27,19 @@ 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 = [
   "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 {

android/app/build.gradle

@@ -85,8 +85,8 @@ android {
         applicationId "com.massive"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 36224
-        versionName "2.9"
+        versionCode 36225
+        versionName "2.10"
     }
     signingConfigs {
         release {

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,
   ],
 });

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> {}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "massive",
-  "version": "2.9",
+  "version": "2.10",
   "private": true,
   "license": "GPL-3.0-only",
   "scripts": {