Read multiples notifications and deleted fields of property.new #57 #55

arnaugarcia · arnaugarcia · commit 1cb52f7a7da3 · 2017-06-09T15:43:54.000+02:00
diff --git a/src/main/java/com/arnaugarcia/assessoriatorrelles/domain/Property.java b/src/main/java/com/arnaugarcia/assessoriatorrelles/domain/Property.java
@@ -44,7 +44,6 @@ public class Property implements Serializable {
     @Column(name = "service_type")
     private ServiceType serviceType;
 
-    @NotNull
     @Column(name = "ref", nullable = false)
     private String ref;
 
diff --git a/src/main/java/com/arnaugarcia/assessoriatorrelles/repository/NotificationRepository.java b/src/main/java/com/arnaugarcia/assessoriatorrelles/repository/NotificationRepository.java
@@ -4,6 +4,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
@@ -20,8 +21,9 @@ public interface NotificationRepository extends JpaRepository<Notification,Long>
     @Query("select notification from Notification notification where notification.user.login = ?#{principal.username} AND notification.seen = false order by notification.date desc")
     Page<Notification> findByUserAndSeenIsFalse(Pageable pageable);
 
-    @Query("update Notification n set n.seen = true where n = :notification")
-    void setReadNotification(Notification notification);
+    @Modifying
+    @Query("update Notification n set n.seen = true where n = :id")
+    void setReadNotification(Long id);
 
     @Query("update Notification n set n.seen = false where n.id = :id")
     void setUnReadNotification(Long id);
diff --git a/src/main/java/com/arnaugarcia/assessoriatorrelles/web/rest/NotificationResource.java b/src/main/java/com/arnaugarcia/assessoriatorrelles/web/rest/NotificationResource.java
@@ -77,6 +77,31 @@ public ResponseEntity<Notification> updateNotification(@RequestBody Notification
             .body(result);
     }
 
+    /**
+     * PUT  /notifications : Updates an existing notification.
+     *
+     * @param notificationList the notification to update
+     * @return the ResponseEntity with status 200 (OK) and with body the updated notification,
+     * or with status 400 (Bad Request) if the notification is not valid,
+     * or with status 500 (Internal Server Error) if the notification couldnt be updated
+     * @throws URISyntaxException if the Location URI syntax is incorrect
+     */
+    @PutMapping("/notifications/multiple")
+    @Timed
+    public ResponseEntity<List<Notification>> updateMultipleNotification(@RequestBody List<Notification> notificationList) throws URISyntaxException {
+        log.debug("REST request to update multiple Notification : {}", notificationList.size());
+        if (notificationList.isEmpty()) {
+            return ResponseEntity.badRequest().headers(HeaderUtil.createFailureAlert("notification", "emptylist", "The list is empty")).body(null);
+        }else{
+            for (Notification notification : notificationList){
+                notificationRepository.setReadNotification(notification.getId());
+            }
+            return ResponseEntity.ok()
+                .headers(HeaderUtil.createEntityUpdateAlert("notification", notificationList.toString()))
+                .body(notificationList);
+        }
+    }
+
     /**
      * GET  /notifications : get all the notifications.
      *
@@ -168,11 +193,11 @@ public ResponseEntity<Void> deleteNotification(@PathVariable Long id) {
     /**
      * DELETE  /notifications/
      *
-     * @param list of notifications to delete
+     * @param ids of notifications to delete
      * @return the ResponseEntity with status 200 (OK)
      */
     @DeleteMapping("/notifications")
-    // URL: [6,17
+    // URL: [6-2-4]
     @Timed
     @Transactional
     public ResponseEntity<Void> deleteMultipleNotification(@RequestParam Long cacheBuster, @RequestParam String ids) {
diff --git a/src/main/webapp/app/dashboard/entities/notification/notification.controller.js b/src/main/webapp/app/dashboard/entities/notification/notification.controller.js
@@ -5,9 +5,9 @@
         .module('assessoriaTorrellesApp')
         .controller('NotificationController', NotificationController);
 
-    NotificationController.$inject = ['$scope', '$state', 'DataUtils', 'Notification', 'ParseLinks', 'AlertService', 'pagingParams', 'paginationConstants'];
+    NotificationController.$inject = ['$scope', '$state', 'DataUtils', 'Notification', 'AlertService', 'pagingParams', 'paginationConstants'];
 
-    function NotificationController ($scope, $state, DataUtils, Notification, ParseLinks, AlertService, pagingParams, paginationConstants) {
+    function NotificationController ($scope, $state, DataUtils, Notification, AlertService, pagingParams, paginationConstants) {
         var vm = this;
 
         vm.loadPage = loadPage;
@@ -30,11 +30,16 @@
             function onError(error) {
                 AlertService.error(error.data.message);
             }
+            $state.go($state.current);
         }
 
         vm.deleteNotifications = function deleteNotifications() {
-            console.log("ids" + getAllChecked());
-                Notification.multipleDelete({"ids" : getAllChecked()}, $state.go($state.current, {}, {reload: true}));
+            Notification.multipleDelete({"ids" : getAllChecked()}, reloadView(), console.log("Error"));
+        };
+
+        vm.updateNotifications = function updateNotifications() {
+            console.log(getAllNotificationsChecked());
+            Notification.setRead(getAllNotificationsChecked(), reloadView(), console.log("ERROR :("))
 
         };
 
@@ -75,5 +80,19 @@
             return allChecked;
 
         }
+
+        function getAllNotificationsChecked() {
+            var allChecked = [];
+            angular.forEach(vm.notifications, function (itm) {
+                if (itm.selected){
+                    allChecked.push(itm);
+                }
+            });
+            return allChecked;
+        }
+
+        function reloadView(){
+            $state.go($state.current, {}, {reload: true});
+        }
     }
 })();
diff --git a/src/main/webapp/app/dashboard/entities/notification/notification.service.js b/src/main/webapp/app/dashboard/entities/notification/notification.service.js
@@ -14,6 +14,7 @@
             'byUser': { method: 'GET', isArray: true, url: 'api/notifications/byUser'},
             'byUserActive': { method: 'GET', isArray: true, url: 'api/notifications/byUser/active'},
             'multipleDelete': { method: 'DELETE', isArray: true,  url: 'api/notifications/'},
+            'setRead': { method: 'PUT', isArray: true,  url: 'api/notifications/multiple'},
             'get': {
                 method: 'GET',
                 transformResponse: function (data) {
diff --git a/src/main/webapp/app/dashboard/entities/notification/notifications.html b/src/main/webapp/app/dashboard/entities/notification/notifications.html
@@ -54,8 +54,8 @@ <h3 class="box-title" data-translate="assessoriaTorrellesApp.notification.home.t
                             <input type="checkbox" class="btn btn-default btn-sm" ng-click="vm.toggleAll()" ng-model="vm.isAllSelected">
                             <div class="btn-group">
                                 <button type="button" class="btn btn-default btn-sm" ng-click="vm.deleteNotifications()"><i class="fa fa-trash-o"></i></button>
-                                <button type="button" class="btn btn-default btn-sm"><i class="fa fa-reply"></i></button>
-                                <button type="button" class="btn btn-default btn-sm"><i class="fa fa-share"></i></button>
+                                <button type="button" class="btn btn-default btn-sm" ng-click="vm.updateNotifications()"><i class="fa fa-envelope-o"></i></button>
+                                <button type="button" class="btn btn-default btn-sm" ng-click="vm.updateNotifications()"><i class="fa fa-envelope"></i></button>
                             </div>
                             <!-- /.btn-group -->
                             <button type="button" class="btn btn-default btn-sm"><i class="fa fa-refresh"></i></button>
diff --git a/src/main/webapp/app/dashboard/entities/property/dashboard.property-new.html b/src/main/webapp/app/dashboard/entities/property/dashboard.property-new.html
@@ -70,11 +70,11 @@ <h3 class="box-title" data-translate="assessoriaTorrellesApp.property.admin.main
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="control-label" data-translate="assessoriaTorrellesApp.property.ref"
+<!--                            <label class="control-label" data-translate="assessoriaTorrellesApp.property.ref"
                                    for="field_ref">Ref</label>
                             <input type="text" class="form-control" name="ref" id="field_ref_prop"
                                    ng-model="vm.property.ref"
-                                   required/>
+                                   required/>-->
                             <div ng-show="editForm.ref.$invalid">
                                 <p class="help-block"
                                    ng-show="editForm.ref.$error.required" data-translate="entity.validation.required">
@@ -252,10 +252,10 @@ <h3 class="box-title" data-translate="assessoriaTorrellesApp.property.location">
                         </div>
 
 
-                        <div class="form-group">
+                    <!--<div class="form-group">
                             <label class="control-label" data-translate="assessoriaTorrellesApp.location.ref" for="field_ref">Ref</label>
                             <input type="text" class="form-control" name="ref" id="field_ref" ng-model="vm.location.ref"/>
-                        </div>
+                        </div>-->
                         <div class="form-group">
                             <label class="control-label" data-translate="assessoriaTorrellesApp.location.province" for="field_province">Province</label>
                             <input type="text" class="form-control" name="province" id="field_province" ng-model="vm.location.province" required />
