Skip to content

fix history size limit and graph #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
krislibrekdp wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix history size limit and graph #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0517fc
code from main
krislibrekdp Jul 30, 2023
a3341e7
working queries for history logs
krislibrekdp Jul 31, 2023
89ee084
limit graph size
krislibrekdp Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions queries/historyQueries.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,21 @@ import { db } from "../utils/db";
import { executeQuery } from "./tableSetup";

const fetchLogsData = async () => {
const result = await AsyncStorage.getItem("userData");
return JSON.parse(result);
const result = await AsyncStorage.getItem("userData");
return JSON.parse(result);
};

const graphData = async () => {
const result = executeQuery(
"SELECT * FROM data ORDER BY substr (date,5,7) || substr(date,9,10) || substr(date,12,15) DESC limit 15",
[]
);
return result;
};
// const graphData = async () => {
// const result = executeQuery(
// "SELECT * FROM data ORDER BY substr (date,5,7) || substr(date,9,10) || substr(date,12,15) DESC limit 15",
// []
// );
// return result;
// };

const graphData2 = async () => {
const result = executeQuery(
"SELECT * FROM data ORDER BY substr (date,5,7) || substr(date,9,10) || substr(date,12,15) DESC limit 5",
[]
);
return result;
const graphData = async () => {
const result = await AsyncStorage.getItem("userData");
return JSON.parse(result);
};

export { fetchLogsData, graphData, graphData2 };
export { fetchLogsData, graphData };
169 changes: 88 additions & 81 deletions queries/tableSetup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,108 +2,115 @@ import AsyncStorage from "@react-native-async-storage/async-storage";
import { db } from "../utils/db";

const dbSetup = () => {
db.transaction((tx) => {
tx.executeSql(
"CREATE TABLE IF NOT EXISTS data (id INTEGER PRIMARY KEY AUTOINCREMENT, date TEXT, intake INTEGER, goal INTEGER);"
);
});
db.transaction((tx) => {
tx.executeSql(
"CREATE TABLE IF NOT EXISTS data (id INTEGER PRIMARY KEY AUTOINCREMENT, date TEXT, intake INTEGER, goal INTEGER);"
);
});
};

const createTodayRow = async () => {
let date = new Date();
date.setHours(0, 0, 0, 0);
date = date.toString();
const data = await AsyncStorage.getItem("userData");
if (data === null) {
await AsyncStorage.setItem(
"userData",
JSON.stringify([
{
date: date,
intake: 0,
goal: 0,
},
])
);
} else {
const parsedData = JSON.parse(data);
if (parsedData[parsedData.length - 1].date !== date) {
parsedData.push({
date: date,
intake: 0,
goal: 0,
});
await AsyncStorage.setItem("userData", JSON.stringify(parsedData));
console.log("createTodayRow");
}
let date = new Date();
date.setHours(0, 0, 0, 0);
date = date.toString();
const data = await AsyncStorage.getItem("userData");
if (data === null) {
await AsyncStorage.setItem(
"userData",
JSON.stringify([
{
date: date,
intake: 0,
goal: 0,
},
])
);
} else {
const parsedData = JSON.parse(data);
if (parsedData[parsedData.length - 1].date !== date) {
parsedData.push({
date: date,
intake: 0,
goal: 0,
});
await AsyncStorage.setItem("userData", JSON.stringify(parsedData));
console.log("createTodayRow");
}
}

await db.transaction((tx) => {
tx.executeSql(
"SELECT * FROM data ORDER BY id DESC LIMIT 1",
[date, "0"],
(_, { rows }) => {
if (rows.length === 0 || rows._array[0].date !== date) {
db.transaction((tx) => {
tx.executeSql(
"INSERT INTO data (date, intake, goal) VALUES (?, ?, ?)",
[date, 0, 0]
);
});
}
}
);
});
await db.transaction((tx) => {
tx.executeSql(
"SELECT * FROM data ORDER BY id DESC LIMIT 1",
[date, "0"],
(_, { rows }) => {
if (rows.length === 0 || rows._array[0].date !== date) {
db.transaction((tx) => {
tx.executeSql(
"INSERT INTO data (date, intake, goal) VALUES (?, ?, ?)",
[date, 0, 0]
);
});
}
}
);
});
};

const testQuery = async () => {
await db.transaction((tx) => {
testQuery2();
tx.executeSql("SELECT * FROM data", [], (_, { rows }) => {
for (let i = 0; i < rows.length; i++) {}
});
await db.transaction((tx) => {
testQuery2();
tx.executeSql("SELECT * FROM data", [], (_, { rows }) => {
for (let i = 0; i < rows.length; i++) {}
});
});
};

const testQuery2 = async () => {
await db.transaction((tx) => {
tx.executeSql("SELECT * FROM data", [], (_, { rows }) => {});
});
await db.transaction((tx) => {
tx.executeSql("SELECT * FROM data", [], (_, { rows }) => {});
});
};

//clear history logs, by dropping table
// old code
// const dropTable = async () => {
// await db.transaction((tx) => {
// tx.executeSql("Drop Table IF EXISTS Data");
// //after dropping create a table
// dbSetup();
// //create a row
// createTodayRow();
// });
// };

const dropTable = async () => {
await db.transaction((tx) => {
tx.executeSql("Drop Table IF EXISTS Data");
//after dropping create a table
dbSetup();
//create a row
createTodayRow();
});
AsyncStorage.setItem("userData", "");
dbSetup();
createTodayRow();
};

const executeQuery = (sql, params) => {
return new Promise((resolve, reject) => {
db.transaction((tx) => {
tx.executeSql(
sql,
params,
(_, { rows }) => {
resolve(rows._array);
},
(_, error) => {
reject(error);
}
);
});
return new Promise((resolve, reject) => {
db.transaction((tx) => {
tx.executeSql(
sql,
params,
(_, { rows }) => {
resolve(rows._array);
},
(_, error) => {
reject(error);
}
);
});
});
};

export {
dbSetup,
createTodayRow,
testQuery,
testQuery2,
executeQuery,
dropTable,
dbSetup,
createTodayRow,
testQuery,
testQuery2,
executeQuery,
dropTable,
};
Loading