Merge pull request 'Add leading zeros to minute and day of month fields' (#219) from svenf/Massive:fix-date-format into master
Reviewed-on: brandon.presley/Massive#219
This commit is contained in:
commit
9b52aec554
2
App.tsx
2
App.tsx
|
@ -18,6 +18,7 @@ import { AppDataSource } from "./data-source";
|
||||||
import { settingsRepo } from "./db";
|
import { settingsRepo } from "./db";
|
||||||
import { ThemeContext } from "./use-theme";
|
import { ThemeContext } from "./use-theme";
|
||||||
import TimerProgress from "./TimerProgress";
|
import TimerProgress from "./TimerProgress";
|
||||||
|
import { MigrationExecutor } from "typeorm";
|
||||||
|
|
||||||
export const CombinedDefaultTheme = {
|
export const CombinedDefaultTheme = {
|
||||||
...NavigationDefaultTheme,
|
...NavigationDefaultTheme,
|
||||||
|
@ -53,6 +54,7 @@ const App = () => {
|
||||||
(async () => {
|
(async () => {
|
||||||
if (!AppDataSource.isInitialized)
|
if (!AppDataSource.isInitialized)
|
||||||
await AppDataSource.initialize().catch((e) => setError(e.toString()));
|
await AppDataSource.initialize().catch((e) => setError(e.toString()));
|
||||||
|
|
||||||
const gotSettings = await settingsRepo.findOne({ where: {} });
|
const gotSettings = await settingsRepo.findOne({ where: {} });
|
||||||
console.log({ gotSettings });
|
console.log({ gotSettings });
|
||||||
setAppSettings({
|
setAppSettings({
|
||||||
|
|
|
@ -27,19 +27,19 @@ const twelveHours = [
|
||||||
"dd/LL/yyyy, p",
|
"dd/LL/yyyy, p",
|
||||||
"ccc p",
|
"ccc p",
|
||||||
"p",
|
"p",
|
||||||
"yyyy-MM-d",
|
"yyyy-MM-dd",
|
||||||
"yyyy-MM-d, p",
|
"yyyy-MM-dd, p",
|
||||||
"yyyy.MM.d",
|
"yyyy.MM.dd",
|
||||||
];
|
];
|
||||||
|
|
||||||
const twentyFours = [
|
const twentyFours = [
|
||||||
"dd/LL/yyyy",
|
"dd/LL/yyyy",
|
||||||
"dd/LL/yyyy, k:m",
|
"dd/LL/yyyy, k:mm",
|
||||||
"ccc k:m",
|
"ccc k:mm",
|
||||||
"k:m",
|
"k:mm",
|
||||||
"yyyy-MM-d",
|
"yyyy-MM-dd",
|
||||||
"yyyy-MM-d, k:m",
|
"yyyy-MM-dd, k:mm",
|
||||||
"yyyy.MM.d",
|
"yyyy.MM.dd",
|
||||||
];
|
];
|
||||||
|
|
||||||
interface Item {
|
interface Item {
|
||||||
|
|
|
@ -39,6 +39,7 @@ import Settings from "./settings";
|
||||||
import Weight from "./weight";
|
import Weight from "./weight";
|
||||||
import { settingsDefaultSets1700009253976 } from "./migrations/1700009253976-settings-default-sets";
|
import { settingsDefaultSets1700009253976 } from "./migrations/1700009253976-settings-default-sets";
|
||||||
import { settingsDefaults1700009729468 } from "./migrations/1700009729468-settings-defaults";
|
import { settingsDefaults1700009729468 } from "./migrations/1700009729468-settings-defaults";
|
||||||
|
import { leadingZeros1707094662099 } from "./migrations/1707094662099-leading-zeros";
|
||||||
|
|
||||||
export const AppDataSource = new DataSource({
|
export const AppDataSource = new DataSource({
|
||||||
type: "react-native",
|
type: "react-native",
|
||||||
|
@ -84,5 +85,6 @@ export const AppDataSource = new DataSource({
|
||||||
autoConvert1699948105001,
|
autoConvert1699948105001,
|
||||||
settingsDefaultSets1700009253976,
|
settingsDefaultSets1700009253976,
|
||||||
settingsDefaults1700009729468,
|
settingsDefaults1700009729468,
|
||||||
|
leadingZeros1707094662099,
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|
39
migrations/1707094662099-leading-zeros.ts
Normal file
39
migrations/1707094662099-leading-zeros.ts
Normal file
|
@ -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> {}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user