added ability to edit category

MrChebik · MrChebik · commit 4c954ed5cbd7 · 2017-02-02T21:10:13.000+02:00
diff --git a/src/main/java/ru/mrchebik/repository/CategoryRepository.java b/src/main/java/ru/mrchebik/repository/CategoryRepository.java
@@ -23,4 +23,8 @@ public interface CategoryRepository extends JpaRepository<Category, Long> {
 
     @Query("select category.categoryId, category.name, category.level, category.parentId from ru.mrchebik.model.Category category where category.parentId = :parentId and category.user.userId = :userId")
     List<Object[]> findByParentId(@Param("parentId") long parentId, @Param("userId") long userId);
+
+    @Modifying
+    @Query("update ru.mrchebik.model.Category category set category.name = :name where category.categoryId = :categoryId")
+    void update(@Param("categoryId") long categoryId, @Param("name") String name);
 }
diff --git a/src/main/java/ru/mrchebik/service/CategoryService.java b/src/main/java/ru/mrchebik/service/CategoryService.java
@@ -9,6 +9,7 @@
  */
 public interface CategoryService {
     void add(Category category);
+    void edit(String name, long categoryId);
     Category findById(long id);
     Category findByParentIdThroughCategoryId(long parentId, long userId);
     List<Category> findByParentId(long parentId, long userId);
diff --git a/src/main/java/ru/mrchebik/service/impl/CategoryServiceImpl.java b/src/main/java/ru/mrchebik/service/impl/CategoryServiceImpl.java
@@ -26,6 +26,11 @@ public void add(Category category) {
         categoryRepository.saveAndFlush(category);
     }
 
+    @Override
+    public void edit(String name, long categoryId) {
+        categoryRepository.update(categoryId, name);
+    }
+
     @Override
     public Category findById(long id) {
         return categoryRepository.findOne(id);
diff --git a/src/main/java/ru/mrchebik/web/CategoryController.java b/src/main/java/ru/mrchebik/web/CategoryController.java
@@ -134,4 +134,12 @@ private void removeCategories(Category category, long userId) {
             }
         }
     }
+
+    @RequestMapping(value = "/edit", method = GET)
+    public String removeCategory(@RequestParam String id,
+                                 @RequestParam String name) {
+        categoryService.edit(name, Long.parseLong(id));
+
+        return "redirect:/blog/categories/-1";
+    }
 }
diff --git a/src/main/webapp/WEB-INF/views/Category.jsp b/src/main/webapp/WEB-INF/views/Category.jsp
@@ -16,9 +16,14 @@
     <script type="text/javascript" src="<c:url value="/resources/js/Category.js"/>"></script>
     <script type="text/javascript" src="<c:url value="/resources/js/submit.js"/>"></script>
     <style>
-        td:nth-child(3) {
+        td:nth-child(3), td:nth-child(4) {
             width: 3%;
         }
+
+        #save, .text {
+            display: none;
+        }
+
     </style>
 </head>
 <body>
@@ -74,7 +79,8 @@
                         <c:forEach items="${categories}" var="category" >
                             <tr>
                                 <td>${categories.indexOf(category) + 1}</td>
-                                <td onclick="window.location.href='/blog/categories/${category.categoryId}'">${category.name}</td>
+                                <td><span id="cat${category.categoryId}" class="fake-link" onclick="window.location.href='/blog/categories/${category.categoryId}'">${category.name}</span><input id="text${category.categoryId}" class="text" type="text" placeholder="Name" value="${category.name}" oninput="checkText(this)"></td>
+                                <td><span id="edit" class="fake-link" onclick="edit(${category.categoryId})">Edit</span><span id="save" class="fake-link" onclick="saveData(${category.categoryId})">Save</span></td>
                                 <td><span class="fake-link" onclick="window.location.href='/blog/categories/delete?id=${category.categoryId}'">Remove</span></td>
                             </tr>
                         </c:forEach>
diff --git a/src/main/webapp/resources/js/Title.js b/src/main/webapp/resources/js/Title.js
@@ -61,4 +61,4 @@ function checkSelects(sel, i, maxLevel) {
             nextBox.style.display = 'none';
         }
     }
-}
+}
diff --git a/src/main/webapp/resources/js/submit.js b/src/main/webapp/resources/js/submit.js
@@ -1,7 +1,34 @@
 /**
  * Created by mrchebik on 24.01.17.
  */
+var error = 1;
+
 function submitData(id, elementId) {
     document.getElementById(elementId).value = id;
     document.getElementById("form2").submit();
+}
+
+function saveData(id) {
+    if (error == 0) {
+        window.location.href='/blog/categories/edit?id=' + id + '&name=' + document.getElementById('text' + id).value;
+    } else {
+        alert('Error, check name of category');
+    }
+}
+
+function edit(i) {
+    document.getElementById('edit').style.display = 'none';
+    document.getElementById('save').style.display = 'block';
+    document.getElementById('cat' + i).style.display = 'none';
+    document.getElementById('text' + i).style.display = 'block';
+}
+
+function checkText(i) {
+    if (i.value.length < 1 || i.value.length > 50) {
+        i.style.borderColor = 'red';
+        error = 1;
+    } else {
+        i.style.borderColor = "black";
+        error = 0;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,8 @@ public interface CategoryRepository extends JpaRepository<Category, Long> {`
`23`	`23`
`24`	`24`	`@Query("select category.categoryId, category.name, category.level, category.parentId from ru.mrchebik.model.Category category where category.parentId = :parentId and category.user.userId = :userId")`
`25`	`25`	`List<Object[]> findByParentId(@Param("parentId") long parentId, @Param("userId") long userId);`
	`26`	`+`
	`27`	`+ @Modifying`
	`28`	`+ @Query("update ru.mrchebik.model.Category category set category.name = :name where category.categoryId = :categoryId")`
	`29`	`+ void update(@Param("categoryId") long categoryId, @Param("name") String name);`
`26`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,4 +134,12 @@ private void removeCategories(Category category, long userId) {`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`	`}`
	`137`	`+`
	`138`	`+ @RequestMapping(value = "/edit", method = GET)`
	`139`	`+ public String removeCategory(@RequestParam String id,`
	`140`	`+ @RequestParam String name) {`
	`141`	`+ categoryService.edit(name, Long.parseLong(id));`
	`142`	`+`
	`143`	`+ return "redirect:/blog/categories/-1";`
	`144`	`+ }`
`137`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,4 +61,4 @@ function checkSelects(sel, i, maxLevel) {`
`61`	`61`	`nextBox.style.display = 'none';`
`62`	`62`	`}`
`63`	`63`	`}`
`64`		`-}`
	`64`	`+}`