Merge pull request #56 from totono/develop

release 5.0
totono · Apr 18, 2023 · 4b72def · 4b72def
2 parents c2dfc48 + 19f210f
commit 4b72def
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 7 deletions.
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "todo"
-version = "0.4.3"
+version = "0.5.0"
 description = "todo"
 authors = ["totono"]
 license = ""

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "todo",
-    "version": "0.4.3"
+    "version": "0.5.0"
   },
   "tauri": {
     "systemTray": {

diff --git a/src/components/elements/layouts/taskItem/Row.tsx b/src/components/elements/layouts/taskItem/Row.tsx
@@ -7,6 +7,7 @@ import { InputState } from "../../Input/InputState";
 import { Content } from "./Content";
 import { Header } from "./Header";
 import { listItemStyle } from "./rowStyle";
+import dayjs from "dayjs";
 
 const { Panel } = Collapse;
 
@@ -40,11 +41,32 @@ export const Row = ({ task, setFetch }: rowProps) => {
   }))(task);
   const [taskState, setTaskState] = useState(state);
 
+  // check task is overdue
+  const activeId = () => {
+    if (taskState.limit_date === undefined
+        || taskState.is_completed === "Yes"
+        || taskState.is_deleted === "Yes") {
+      return undefined;
+    }
+    let time = taskState.limit_time;
+    if (time === undefined) {
+      time = "23:59";
+    }
+    const today = dayjs();
+    const limit = dayjs(taskState.limit_date + " " + time);
+    if (today.isAfter(limit)) {
+      return taskState.id;
+    } else {
+      undefined
+    };
+  };
+
+
   return (
     <li css={listItemStyle(state)}>
-      <Collapse>
+      <Collapse activeKey={activeId()}>
         <Panel
-          key="taskHeader"
+          key={taskState.id}
           collapsible={"icon"}
           showArrow={!isEditing}
           header={

diff --git a/src/components/elements/layouts/taskItem/buttons/EditConfirmButton.tsx b/src/components/elements/layouts/taskItem/buttons/EditConfirmButton.tsx
@@ -36,8 +36,8 @@ return (
 const isFuture = (task:InputState) => {
     if (task.limit_date == undefined) {return "No"}
 
-    let time = ""
-    if (task.limit_time == undefined) { time = "23:59"}
+    let time = task.limit_time;
+    if (task.limit_time == undefined) { time = "23:59"};
     const now = dayjs();
     const limit = dayjs(task.limit_date +" "+ time);
     if (now.isBefore(limit)){