WORK ON DOCUMENT CONTROLLER

CREATE NOMENCLATURE CONTROLLER TODO: REQUEST MANIPULATION MESSAGE MANIPULATION DOCUMENT MANIPULATION DOCUMENT FILE MANIPULATION TASK MANIPULATION SHOW CONTEOLLED TASK FOR USER SHOW USERS TASK STOREHAUSE MANIPULATION GOOD PRODUCTION AND SERVICE REGISTER BED PRODUCT
FairWindCo · Oct 29, 2015 · 6343e7f · 6343e7f
1 parent 266243f
commit 6343e7f
Show file tree

Hide file tree

Showing 10 changed files with 553 additions and 93 deletions.
diff --git a/src/main/java/ua/pp/fairwind/favorid/internalDB/controllers/ConterpartyController.java b/src/main/java/ua/pp/fairwind/favorid/internalDB/controllers/ConterpartyController.java
@@ -453,7 +453,7 @@ public Object simpleClientList(@RequestParam(required = false) Integer page_num,
     @ResponseBody
     public Object simpleAgrimentsList(@RequestParam(required = false) Integer page_num, @RequestParam(required = false) Integer per_page,@RequestParam(value = "pkey_val[]",required = false) String pkey,@RequestParam(value = "q_word[]",required = false) String[] qword,@RequestParam(required = false) Long counterpart_id) {
         //Sort sort= FormSort.formSortFromSortDescription(orderby);
-        Sort sort=new Sort(Sort.Direction.ASC,"shortName");
+        Sort sort=new Sort(Sort.Direction.ASC,"name");
         PageRequest pager=null;
         if(page_num!=null && per_page!=null) {
             page_num= page_num<1?1:page_num;

diff --git a/src/main/java/ua/pp/fairwind/favorid/internalDB/controllers/RequestController.java b/src/main/java/ua/pp/fairwind/favorid/internalDB/controllers/RequestController.java
@@ -189,13 +189,13 @@ public boolean update(HttpServletRequest req,Request request){
             }
         }
         UserDetailsAdapter userDetail=(UserDetailsAdapter) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-        if(userDetail==null){
+        if(userDetail!=null){
             request.setResponsiblePerson(userDetail.getUserPerson());
         } else {
             return false;
         }
         Long counterparty_id=Utils.getLongParameter("counterpart_id",req);
-        Long requesttype=Utils.getLongParameter("requesttype",req);
+        Long requesttype=Utils.getLongParameter("typeRequest",req);
         Long agreement_id=Utils.getLongParameter("agreement_id", req);
         Long parent_request_id=Utils.getLongParameter("parent_request_id", req);
         if(counterparty_id!=null){
@@ -204,7 +204,9 @@ public boolean update(HttpServletRequest req,Request request){
         }
         if(agreement_id!=null){
             Agreement agreement=agrimentRepository.findOne(agreement_id);
-            request.setCounterparty(agreement.getCounterparty());
+            if(agreement!=null) {
+                request.setCounterparty(agreement.getCounterparty());
+            }
             request.setAgreement(agreement);
         }
         if(parent_request_id!=null){
@@ -290,7 +292,7 @@ public JGridRowsResponse<RequestItems> getItemTable(HttpServletRequest request){
     }
 
     @Transactional(readOnly = false)
-    @RequestMapping(value = "/edit", method = {RequestMethod.POST,RequestMethod.GET})
+    @RequestMapping(value = "/subscribe", method = {RequestMethod.POST,RequestMethod.GET})
     public void subscribe(@RequestParam long id,HttpServletResponse response)throws IOException {
         UserDetailsAdapter userDetail=(UserDetailsAdapter) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         Request request = requestRepository.findOne(id);
@@ -309,7 +311,7 @@ public void subscribe(@RequestParam long id,HttpServletResponse response)throws
 
     @Transactional(readOnly = false)
     @RequestMapping(value = "/edit", method = {RequestMethod.POST,RequestMethod.GET})
-    public void editor(@RequestParam String oper,@RequestParam long id,HttpServletRequest req,HttpServletResponse response)throws IOException {
+    public void editor(@RequestParam String oper,@RequestParam Long id,HttpServletRequest req,HttpServletResponse response)throws IOException {
         switch (oper){
             case "add":
                 Request request=new Request();
@@ -319,6 +321,10 @@ public void editor(@RequestParam String oper,@RequestParam long id,HttpServletRe
                 }
                 break;
             case "edit":
+                if(id==null){
+                    response.sendError(406,"NO REQUEST FOUND");
+                    return;
+                }
                 Request fromDB= requestRepository.getOne(id);
                 if(fromDB.isExecuted() || fromDB.getApprovedPerson()!=null){
                     response.sendError(403,"FORBIDDEN!");
@@ -337,6 +343,10 @@ public void editor(@RequestParam String oper,@RequestParam long id,HttpServletRe
 
                 break;
             case "del":
+                if(id==null){
+                    response.sendError(406,"NO REQUEST FOUND");
+                    return;
+                }
                 requestRepository.delete(id);
                 response.setStatus(200);
                 break;
@@ -375,7 +385,7 @@ public boolean updateItem(HttpServletRequest req,RequestItems item,Request paren
 
     @Transactional(readOnly = false)
     @RequestMapping(value = "/editItem", method = {RequestMethod.POST,RequestMethod.GET})
-    public void itemEditor(@RequestParam String oper,@RequestParam long id,@RequestParam long requestid,HttpServletRequest req,HttpServletResponse response)throws IOException {
+    public void itemEditor(@RequestParam String oper,@RequestParam Long id,@RequestParam long requestid,HttpServletRequest req,HttpServletResponse response)throws IOException {
         Request request = requestRepository.findOne(requestid);
         if (request == null) {
             response.sendError(404, "REQUEST NOT FOUND!");
@@ -394,6 +404,10 @@ public void itemEditor(@RequestParam String oper,@RequestParam long id,@RequestP
                 response.setStatus(200);
                 }break;
             case "edit": {
+                if(id==null){
+                    response.sendError(406,"NO REQUEST ITEM FOUND");
+                    return;
+                }
                 RequestItems item=requestItemRepository.findOne(id);
                 if (item != null) {
                     if(!updateItem(req, item, request)){
@@ -408,6 +422,10 @@ public void itemEditor(@RequestParam String oper,@RequestParam long id,@RequestP
 
             }break;
             case "del":
+                if(id==null){
+                    response.sendError(406,"NO REQUEST ITEM FOUND");
+                    return;
+                }
                 requestRepository.delete(id);
                 requestRepository.save(request);
                 response.setStatus(200);

diff --git a/src/main/java/ua/pp/fairwind/favorid/internalDB/controllers/StorehouseOperation.java b/src/main/java/ua/pp/fairwind/favorid/internalDB/controllers/StorehouseOperation.java
@@ -443,7 +443,7 @@ public JGridRowsResponse<Document> getDocumentsTable(HttpServletRequest request,
     }
 
     @Transactional(readOnly = false)
-    @RequestMapping(value = "/edit", method = {RequestMethod.POST,RequestMethod.GET})
+    @RequestMapping(value = "/edit_nomenclature", method = {RequestMethod.POST,RequestMethod.GET})
     public void nomenclatureeditor(@RequestParam String oper,@RequestParam long moveid,HttpServletRequest request,HttpServletResponse response)throws IOException {
         Movement movement=movementRepository.findOne(moveid);
         if(movement==null){

diff --git a/src/main/java/ua/pp/fairwind/favorid/internalDB/repository/RequestRepository.java b/src/main/java/ua/pp/fairwind/favorid/internalDB/repository/RequestRepository.java
@@ -23,25 +23,25 @@ public interface RequestRepository extends JpaRepository<Request,Long>{
     @Query("select r from RequestItems r where r.request.id=:requestId")
     Page<RequestItems> getState(@Param(value = "requestId") long requestId, Pageable pager);
     @Query("select r from RequestItems r where r.request.id=:requestId")
-    List<RequestItems> getState(@Param(value = "storehouseId") long requestId);
+    List<RequestItems> getState(@Param(value = "requestId") long requestId);
     @Query("select r from RequestItems r where r.request.id=:requestId")
-    List<RequestItems> getState(@Param(value = "storehouseId") long requestId, Sort sort);
+    List<RequestItems> getState(@Param(value = "requestId") long requestId, Sort sort);
 
 
     @Query("select r from RequestItems r where r.request.id=:requestId and r.nomenclature.name like %:name%")
     Page<RequestItems> getState(@Param(value = "requestId") long requestId,@Param(value = "name")String name, Pageable pager);
     @Query("select r from RequestItems r where r.request.id=:requestId and r.nomenclature.name like %:name%")
-    List<RequestItems> getState(@Param(value = "storehouseId") long requestId,@Param(value = "name")String name);
+    List<RequestItems> getState(@Param(value = "requestId") long requestId,@Param(value = "name")String name);
     @Query("select r from RequestItems r where r.request.id=:requestId and r.nomenclature.name like %:name%")
-    List<RequestItems> getState(@Param(value = "storehouseId") long requestId,@Param(value = "name")String name, Sort sort);
+    List<RequestItems> getState(@Param(value = "requestId") long requestId,@Param(value = "name")String name, Sort sort);
 
 
     @Query("select r from Request r where r.id = :requestId or r.counterparty.shortName like %:requestId% or r.agreement.name like %:requestId%")
     Page<Request> find(@Param(value = "requestId") String requestId, Pageable pager);
     @Query("select r from Request r where r.id = :requestId or r.counterparty.shortName like %:requestId% or r.agreement.name like %:requestId%")
-    List<Request> find(@Param(value = "storehouseId") String requestId);
+    List<Request> find(@Param(value = "requestId") String requestId);
     @Query("select r from Request r where r.id = :requestId or r.counterparty.shortName like %:requestId% or r.agreement.name like %:requestId%")
-    List<Request> find(@Param(value = "storehouseId") String requestId, Sort sort);
+    List<Request> find(@Param(value = "requestId") String requestId, Sort sort);
 
 
 }
diff --git a/src/main/resources/label_en_US.properties b/src/main/resources/label_en_US.properties
@@ -242,4 +242,7 @@ label.storehouse.operation.UTILIZATION=UTILIZATION
 label.PURCHASE=REQUEST PURCHASE
 label.RSHIPMENT=REQUEST SHIPMENT
 label.PRODUCTION=REQUEST PRODATION
-label.REPAIR=REQUEST REPAIT
+label.REPAIR=REQUEST REPAIT
+label.requests.type=Request Type
+label.requests.counterparty=Counerparty
+label.requests.agreements=Agreements
diff --git a/src/main/resources/label_ru_RU.properties b/src/main/resources/label_ru_RU.properties
@@ -241,4 +241,7 @@ label.storehouse.operation.UTILIZATION=UTILIZATION
 label.PURCHASE=REQUEST PURCHASE
 label.RSHIPMENT=REQUEST SHIPMENT
 label.PRODUCTION=REQUEST PRODATION
-label.REPAIR=REQUEST REPAIT
+label.REPAIR=REQUEST REPAIT
+label.requests.type=Request Type
+label.requests.counterparty=Counerparty
+label.requests.agreements=Agreements
diff --git a/src/main/resources/label_ua_UA.properties b/src/main/resources/label_ua_UA.properties
@@ -242,4 +242,7 @@ label.storehouse.operation.UTILIZATION=UTILIZATION
 label.PURCHASE=REQUEST PURCHASE
 label.RSHIPMENT=REQUEST SHIPMENT
 label.PRODUCTION=REQUEST PRODATION
-label.REPAIR=REQUEST REPAIT
+label.REPAIR=REQUEST REPAIT
+label.requests.type=Request Type
+label.requests.counterparty=Counerparty
+label.requests.agreements=Agreements