From 792d013c08311e4eea1449a5f9164aa4382a2b12 Mon Sep 17 00:00:00 2001
From: Sergey Yarkov <serzh.yarkov@gmail.com>
Date: Fri, 12 Jun 2020 21:15:42 +0300
Subject: [PATCH] render upd

---
 client/src/components/Modals/Todo/CreateTodoModal.js | 4 ++--
 client/src/components/Modals/Todo/UpdateTodoModal.js | 6 +++---
 client/src/components/Todos/Todos.js                 | 5 ++++-
 client/src/db/categories.json                        | 8 --------
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/client/src/components/Modals/Todo/CreateTodoModal.js b/client/src/components/Modals/Todo/CreateTodoModal.js
index 54d0ffa..472b2c5 100644
--- a/client/src/components/Modals/Todo/CreateTodoModal.js
+++ b/client/src/components/Modals/Todo/CreateTodoModal.js
@@ -20,7 +20,7 @@ const CreateTodoModal = ({ isModalOpen, handleCloseModal }) => {
     const data = {
       title: elements.title.value,
       description: elements.description.value,
-      category: elements.category.value,
+      categoryId: elements.category.value,
       deadline: elements.deadline.value
     }
     handleCloseModal()
@@ -87,7 +87,7 @@ const CreateTodoModal = ({ isModalOpen, handleCloseModal }) => {
                 onChange={handleFieldChange}
                 label="Категория"
               >
-                {categories.map((category, i) => <MenuItem key={i} value={category._id.$oid}>{category._id.$oid}</MenuItem>)}
+                {categories.map((category, i) => <MenuItem key={i} value={category._id.$oid}>{category.title}</MenuItem>)}
               </Select>
             </FormControl>
             <TextField
diff --git a/client/src/components/Modals/Todo/UpdateTodoModal.js b/client/src/components/Modals/Todo/UpdateTodoModal.js
index 7eea5d7..48b3bfb 100644
--- a/client/src/components/Modals/Todo/UpdateTodoModal.js
+++ b/client/src/components/Modals/Todo/UpdateTodoModal.js
@@ -13,11 +13,11 @@ const UpdateTodoModal = ({ isModalOpen, handleCloseModal, selectedTodo, setSelec
     const data = {
       title: elements.title.value,
       description: elements.description.value,
-      category: elements.category.value,
+      categoryId: elements.category.value,
       deadline: elements.deadline.value
     }
     handleCloseModal()
-    console.log('Request on update:', data)
+    console.log('Request on update todo:', data)
   }
 
   const handleFieldChange = e => {
@@ -75,7 +75,7 @@ const UpdateTodoModal = ({ isModalOpen, handleCloseModal, selectedTodo, setSelec
                 onChange={handleFieldChange}
                 label="Категория"
               >
-                {categories.map((category, i) => <MenuItem key={i} value={category._id.$oid}>{category._id.$oid}</MenuItem>)}
+                {categories.map((category, i) => <MenuItem key={i} value={category._id.$oid}>{category.title}</MenuItem>)}
               </Select>
             </FormControl>
             <TextField
diff --git a/client/src/components/Todos/Todos.js b/client/src/components/Todos/Todos.js
index 4b175a2..f0c1404 100644
--- a/client/src/components/Todos/Todos.js
+++ b/client/src/components/Todos/Todos.js
@@ -7,6 +7,9 @@ import DeleteIcon from '@material-ui/icons/Delete'
 import AlarmIcon from '@material-ui/icons/Alarm';
 import EditIcon from '@material-ui/icons/Edit';
 
+
+import categories from '../../db/categories.json'
+
 const useStyles = makeStyles((theme) => ({
   alarmIcon: {
     marginRight: 10
@@ -62,7 +65,7 @@ const Todos = ({ data, fromTrashContainer }) => {
           <Card>
             <CardContent>
               <Typography className={classes.cardCategoryHeading} color="textSecondary" gutterBottom>
-                CategoryId: {todo.categoryId}
+                {categories.find(category => category._id.$oid === todo.categoryId).title}
                 <span className={classes.cardAlarm}>
                   <AlarmIcon className={classes.alarmIcon} color='action' />
                   {todo.deadline}
diff --git a/client/src/db/categories.json b/client/src/db/categories.json
index 877418d..86ca0c3 100644
--- a/client/src/db/categories.json
+++ b/client/src/db/categories.json
@@ -22,12 +22,4 @@
   "description": "some description",
   "updatedAt": "2020-04-04",
   "createdAt": "2020-01-01"
-},{
-  "_id": {
-    "$oid": "5ede83c823d3141d80145f2b"
-  },
-  "title": "upd category title",
-  "description": "upd category description",
-  "createdAt": "2020-06-08T18:30:32.811Z",
-  "updatedAt": "2020-06-08T18:32:34.962Z"
 }]
\ No newline at end of file