Revert "Revert "Add setting for date format""
This reverts commit 3691c729b4
.
This commit is contained in:
parent
6f41f87dc1
commit
a5c70050a7
|
@ -29,6 +29,7 @@ export default function SettingsPage() {
|
||||||
const [showUnit, setShowUnit] = useState(!!settings.showUnit);
|
const [showUnit, setShowUnit] = useState(!!settings.showUnit);
|
||||||
const [workouts, setWorkouts] = useState(!!settings.workouts);
|
const [workouts, setWorkouts] = useState(!!settings.workouts);
|
||||||
const [steps, setSteps] = useState(!!settings.steps);
|
const [steps, setSteps] = useState(!!settings.steps);
|
||||||
|
const [date, setDate] = useState('%Y-%m-%d %H:%M');
|
||||||
const {color, setColor} = useContext(CustomTheme);
|
const {color, setColor} = useContext(CustomTheme);
|
||||||
const {toast} = useContext(SnackbarContext);
|
const {toast} = useContext(SnackbarContext);
|
||||||
|
|
||||||
|
@ -50,6 +51,7 @@ export default function SettingsPage() {
|
||||||
color,
|
color,
|
||||||
workouts: +workouts,
|
workouts: +workouts,
|
||||||
steps: +steps,
|
steps: +steps,
|
||||||
|
date,
|
||||||
});
|
});
|
||||||
getSettings().then(setSettings);
|
getSettings().then(setSettings);
|
||||||
}, [
|
}, [
|
||||||
|
@ -64,6 +66,7 @@ export default function SettingsPage() {
|
||||||
workouts,
|
workouts,
|
||||||
steps,
|
steps,
|
||||||
setSettings,
|
setSettings,
|
||||||
|
date,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const changeAlarmEnabled = useCallback(
|
const changeAlarmEnabled = useCallback(
|
||||||
|
@ -193,6 +196,23 @@ export default function SettingsPage() {
|
||||||
))}
|
))}
|
||||||
</Picker>
|
</Picker>
|
||||||
)}
|
)}
|
||||||
|
{'date format'.includes(search.toLowerCase()) && (
|
||||||
|
<Picker
|
||||||
|
style={{color}}
|
||||||
|
dropdownIconColor={color}
|
||||||
|
selectedValue={date}
|
||||||
|
onValueChange={value => setDate(value)}>
|
||||||
|
<Picker.Item
|
||||||
|
value="%Y-%m-%d %H:%M"
|
||||||
|
label="Format date as 1990-12-24 15:05"
|
||||||
|
/>
|
||||||
|
<Picker.Item
|
||||||
|
value="%Y-%m-%d"
|
||||||
|
label="Format date as 1990-12-24 (YYYY-MM-dd)"
|
||||||
|
/>
|
||||||
|
<Picker.Item value="%m-%d" label="Format date as 12-24 (MM-dd)" />
|
||||||
|
</Picker>
|
||||||
|
)}
|
||||||
{'alarm sound'.includes(search.toLowerCase()) && (
|
{'alarm sound'.includes(search.toLowerCase()) && (
|
||||||
<Button style={{alignSelf: 'flex-start'}} onPress={changeSound}>
|
<Button style={{alignSelf: 'flex-start'}} onPress={changeSound}>
|
||||||
Alarm sound
|
Alarm sound
|
||||||
|
|
3
db.ts
3
db.ts
|
@ -106,6 +106,9 @@ const migrations = [
|
||||||
`
|
`
|
||||||
ALTER TABLE settings ADD COLUMN newSet TEXT NULL
|
ALTER TABLE settings ADD COLUMN newSet TEXT NULL
|
||||||
`,
|
`,
|
||||||
|
`
|
||||||
|
ALTER TABLE settings ADD COLUMN date TEXT NULL
|
||||||
|
`,
|
||||||
];
|
];
|
||||||
|
|
||||||
export let db: SQLiteDatabase;
|
export let db: SQLiteDatabase;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import {db} from './db';
|
import {db} from './db';
|
||||||
import Set from './set';
|
import Set from './set';
|
||||||
|
import {settings} from './settings.service';
|
||||||
|
|
||||||
export const updateSet = async (value: Set) => {
|
export const updateSet = async (value: Set) => {
|
||||||
const update = `
|
const update = `
|
||||||
|
@ -66,13 +67,21 @@ export const getSets = async ({
|
||||||
limit,
|
limit,
|
||||||
offset,
|
offset,
|
||||||
}: PageParams): Promise<Set[]> => {
|
}: PageParams): Promise<Set[]> => {
|
||||||
|
const format = settings.date || '%Y-%m-%d %H:%M';
|
||||||
const select = `
|
const select = `
|
||||||
SELECT * from sets
|
SELECT id, name, reps, weight, sets, minutes, seconds,
|
||||||
|
STRFTIME(?, created) as created, unit, image, steps
|
||||||
|
FROM sets
|
||||||
WHERE name LIKE ? AND NOT hidden
|
WHERE name LIKE ? AND NOT hidden
|
||||||
ORDER BY created DESC
|
ORDER BY created DESC
|
||||||
LIMIT ? OFFSET ?
|
LIMIT ? OFFSET ?
|
||||||
`;
|
`;
|
||||||
const [result] = await db.executeSql(select, [`%${search}%`, limit, offset]);
|
const [result] = await db.executeSql(select, [
|
||||||
|
format,
|
||||||
|
`%${search}%`,
|
||||||
|
limit,
|
||||||
|
offset,
|
||||||
|
]);
|
||||||
return result.rows.raw();
|
return result.rows.raw();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -10,4 +10,5 @@ export default interface Settings {
|
||||||
workouts: number;
|
workouts: number;
|
||||||
nextAlarm?: string;
|
nextAlarm?: string;
|
||||||
steps?: number;
|
steps?: number;
|
||||||
|
date?: string;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user