From a7ff05d7c4abd2c3fc29664eda6ea8a102e4f4ed Mon Sep 17 00:00:00 2001
From: kkzzhizhou <806508401@qq.com>
Date: Sun, 5 Dec 2021 22:28:42 +0800
Subject: [PATCH] fix edit task

---
 src/view/App.tsx                              | 21 +++++++++----------
 .../Taskview/Dailiesview/DailyItem.tsx        |  4 ++--
 .../Taskview/Habitsview/HabitItem.tsx         |  4 ++--
 .../Taskview/Rewardview/RewardItem.tsx        |  6 +++---
 .../Components/Taskview/Todoview/TodoItem.tsx |  4 ++--
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/view/App.tsx b/src/view/App.tsx
index c5f8c86..6a2be49 100644
--- a/src/view/App.tsx
+++ b/src/view/App.tsx
@@ -198,8 +198,8 @@ class App extends React.Component<any, any> {
                         if (event.target.innerText == 'clear') {
                             this.sendDeleteTask(event.target.id, i18next.t('Deleted!'))
                         } else if (event.target.attributes.title.value == 'submit') {
-                            const task_title = event.target.attributes['data-title'].value ? event.target.attributes['data-title'].value : element.text
-                            const task_notes = event.target.attributes['data-notes'].value ? event.target.attributes['data-notes'].value : element.notes
+                            const task_title = event.target.attributes['data-title'].value
+                            const task_notes = event.target.attributes['data-notes'].value
                             this.sendUpdateTask(event.target.id, 'todo', i18next.t("Update!"), task_title, task_notes)
                         }
                     } else {
@@ -230,8 +230,8 @@ class App extends React.Component<any, any> {
                         }
                     } else {
                         if (event.target.attributes.title.value == 'submit') {
-                            const task_title = event.target.attributes['data-title'].value ? event.target.attributes['data-title'].value : element.text
-                            const task_notes = event.target.attributes['data-notes'].value ? event.target.attributes['data-notes'].value : element.notes
+                            const task_title = event.target.attributes['data-title'].value
+                            const task_notes = event.target.attributes['data-notes'].value
                             this.sendUpdateTask(event.target.id, 'daily', i18next.t("Update!"), task_title, task_notes)
                         } else if (event.target.attributes.title.value == 'delete') {
                             this.sendDeleteTask(event.target.id, i18next.t('Deleted!'))
@@ -252,9 +252,9 @@ class App extends React.Component<any, any> {
             this.state.tasks.habits.forEach((element: any) => {
                 if (element.id == event.target.id) {
                     if (event.target.attributes.title && event.target.attributes.title.value == 'submit') {
-                        const task_title = event.target.attributes['data-title'].value ? event.target.attributes['data-title'].value : element.text
-                        const task_notes = event.target.attributes['data-notes'].value ? event.target.attributes['data-notes'].value : element.notes
-                        this.sendUpdateTask(event.target.id, 'daily', i18next.t("Update!"), task_title, task_notes)
+                        const task_title = event.target.attributes['data-title'].value
+                        const task_notes = event.target.attributes['data-notes'].value
+                        this.sendUpdateTask(event.target.id, 'habit', i18next.t("Update!"), task_title, task_notes)
                     } else if (event.target.attributes.title && event.target.attributes.title.value == 'plus') {
                         this.sendScore(event.target.id, "up", i18next.t('Plus!'))
                     } else if (event.target.attributes.title && event.target.attributes.title.value == 'mins') {
@@ -267,7 +267,6 @@ class App extends React.Component<any, any> {
     }
 
     handleChangeRewards(event: any) {
-        console.log(event)
         if (event.target.id == "add-reward") {
             const title = event.target.name
             this.sendAddTask("reward", title, i18next.t('Add!'))
@@ -276,9 +275,9 @@ class App extends React.Component<any, any> {
             this.state.tasks.rewards.forEach((element: any) => {
                 if (element.id == target_id) {
                     if (event.target.attributes.title && event.target.attributes.title.value == 'submit') {
-                        const task_title = event.target.attributes['data-title'].value ? event.target.attributes['data-title'].value : element.text
-                        const task_notes = event.target.attributes['data-notes'].value ? event.target.attributes['data-notes'].value : element.notes
-                        const task_coin = event.target.attributes['data-coin'].value ? event.target.attributes['data-coin'].value : element.value
+                        const task_title = event.target.attributes['data-title'].value
+                        const task_notes = event.target.attributes['data-notes'].value
+                        const task_coin = event.target.attributes['data-coin'].value
                         this.sendUpdateTask(event.target.id, 'reward', i18next.t('Edit!'), task_title, task_notes, task_coin)
                     } else if (event.target.innerText == 'clear') {
                         this.sendDeleteTask(event.target.id, i18next.t('Deleted!'))
diff --git a/src/view/Components/Taskview/Dailiesview/DailyItem.tsx b/src/view/Components/Taskview/Dailiesview/DailyItem.tsx
index 81b44c3..95ba7f1 100644
--- a/src/view/Components/Taskview/Dailiesview/DailyItem.tsx
+++ b/src/view/Components/Taskview/Dailiesview/DailyItem.tsx
@@ -4,8 +4,8 @@ import { Trans } from 'react-i18next'
 
 function DailyItem(props: any) {
     const [state, setState] = React.useState('view')
-    const [title, setTitle] = React.useState('')
-    const [notes, setNotes] = React.useState('')
+    const [title, setTitle] = React.useState(props.daily_text)
+    const [notes, setNotes] = React.useState(props.daily_notes)
     if (state === 'view') {
         return (
             <div className="todo-item" id={props.id}>
diff --git a/src/view/Components/Taskview/Habitsview/HabitItem.tsx b/src/view/Components/Taskview/Habitsview/HabitItem.tsx
index ab70774..aa5b591 100644
--- a/src/view/Components/Taskview/Habitsview/HabitItem.tsx
+++ b/src/view/Components/Taskview/Habitsview/HabitItem.tsx
@@ -5,8 +5,8 @@ import { Trans } from 'react-i18next'
 
 function HabitItem(props: any) {
     const [state, setState] = React.useState('view')
-    const [title, setTitle] = React.useState('')
-    const [notes, setNotes] = React.useState('')
+    const [title, setTitle] = React.useState(props.habit_text)
+    const [notes, setNotes] = React.useState(props.habit_notes)
     if (state == 'view') {
         return (
             <div className="habit-item" id={props.id}>
diff --git a/src/view/Components/Taskview/Rewardview/RewardItem.tsx b/src/view/Components/Taskview/Rewardview/RewardItem.tsx
index 403bd11..f6f0e6c 100644
--- a/src/view/Components/Taskview/Rewardview/RewardItem.tsx
+++ b/src/view/Components/Taskview/Rewardview/RewardItem.tsx
@@ -5,9 +5,9 @@ import { Trans } from 'react-i18next'
 
 function RewardItem(props: any) {
     const [state, setState] = React.useState('view')
-    const [title, setTitle] = React.useState('')
-    const [notes, setNotes] = React.useState('')
-    const [coin, setCoin] = React.useState('0')
+    const [title, setTitle] = React.useState(props.reward_text)
+    const [notes, setNotes] = React.useState(props.reward_notes)
+    const [coin, setCoin] = React.useState(props.reward_value)
     if (state === 'view') {
         return (
             <div className="reward-item" id={props.id}>
diff --git a/src/view/Components/Taskview/Todoview/TodoItem.tsx b/src/view/Components/Taskview/Todoview/TodoItem.tsx
index d7ca8e3..c480e79 100644
--- a/src/view/Components/Taskview/Todoview/TodoItem.tsx
+++ b/src/view/Components/Taskview/Todoview/TodoItem.tsx
@@ -4,8 +4,8 @@ import { Trans } from 'react-i18next'
 
 function TodoItem(props: any) {
     const [state, setState] = React.useState('view')
-    const [title, setTitle] = React.useState('')
-    const [notes, setNotes] = React.useState('')
+    const [title, setTitle] = React.useState(props.todo_text)
+    const [notes, setNotes] = React.useState(props.todo_notes)
     if (state === 'view') {
         return (
             <div className="todo-item" id={props.id}>