@@ -606,6 +657,7 @@ export function FreeFlow(){
setAutoSend(e.target.checked)} />
+
api_status= {status}
chat_status= {chatStatus}
diff --git a/vite/src/util/osc.js b/vite/src/util/osc.js
index 869de3c..8c12139 100644
--- a/vite/src/util/osc.js
+++ b/vite/src/util/osc.js
@@ -25,9 +25,9 @@ export async function sendOsc(key, message){
console.warn('sendOsc: message is empty, skipping');
return;
}
- if(key!=OSC_ADDRESS.HINT && message === '') {
- return;
- }
+ // if(key!=OSC_ADDRESS.HINT && message === '') {
+ // return;
+ // }
try{
console.log(`Sending OSC message: ${key} -> ${message}`);
diff --git a/vite/src/util/useUser.jsx b/vite/src/util/useUser.jsx
index 9b06a00..a64b686 100644
--- a/vite/src/util/useUser.jsx
+++ b/vite/src/util/useUser.jsx
@@ -4,7 +4,7 @@ import { updateUser } from "./backend";
const userContext=createContext();
-const SesstionTime={
+const SessionTime={
A:["12:00", "13:30"],
B:["13:30", "15:00"],
C:["15:00", "17:30"],
@@ -23,14 +23,25 @@ export function UserProvider({children}) {
const [summary, setSummary] = useState(null);
- function getFileId(){
- if(!userId) return `test-${moment().format("YYYYMMDDmmss")}-${sessionId}`;
- return `${moment().format("YYYYMMDD").substring(2)}-${sessionId}-${userId}`;
+ function getFileId(pass){
+ if(!userId) return `${password||moment().format('hhmmss')}_testuser`;
+ return `${password||pass||''}_${userId}`;
}
+ function getDataId(){
+ if(!userId) return `${moment().format('YYYYMM')}/${moment().format("MMDD")}/${sessionId==null? SessionTime[sessionId][0]:'no-sesion'}/testuser_${moment().format('hhmmss')}`;
+ return `${moment().format('YYYYMM')}/${moment().format("MMDD")}/${sessionId==null? SessionTime[sessionId][0]:'no-sesion'}/${userId}`;
+ }
+
+ function getUploadFolder(){
+ return `${moment().format("YYYYMM")}/${moment().format("MMDD")}/${sessionId==null? SessionTime[sessionId][0]:'no-session'}`;
+ }
+
function reset(){
setUserId(null);
setSessionId(null);
setPassword(null);
+ setChoice(null);
+ setSummary(null);
}
function saveHistory(history) {
@@ -39,7 +50,7 @@ export function UserProvider({children}) {
const data={
history,
}
- updateUser(getFileId(), data)
+ updateUser('user/'+getDataId(), data)
.then(() => {
console.log("History saved successfully");
})
@@ -55,17 +66,17 @@ export function UserProvider({children}) {
const data={
userId,
- sessionId,
+ // sessionId,
password,
choice,
summary,
- date: moment().format("YYYY-MM-DD"),
+ date: moment().format("YYYY-MM-DD hh:mm:ss"),
fileId: getFileId(),
};
console.log("Updating user data:", data);
- updateUser(getFileId(), data)
+ updateUser('user/'+getDataId(), data)
.then(() => {
console.log("User data updated successfully");
})
@@ -73,13 +84,13 @@ export function UserProvider({children}) {
console.error("Error updating user data:", error);
});
- },[password, sessionId, choice, summary]);
+ },[password, choice, summary]);
useEffect(() => {
let symbol='';
- for(const [key, value] of Object.entries(SesstionTime)){
+ for(const [key, value] of Object.entries(SessionTime)){
const start=moment(value[0], "HH:mm");
const end=moment(value[1], "HH:mm");
@@ -95,11 +106,11 @@ export function UserProvider({children}) {
return (
- {children}
+ {children}
);
}