Merge branch 'databank' of http://wcollector.idatabank.com:5230/dbs289/LifeCenter.git into databank

src/main/java/com/lemon/lifecenter/controller/BoardController.java

@@ -53,7 +53,6 @@ public class BoardController extends LifeCenterController {
             @RequestParam(value="selectState", required=false, defaultValue="") String selectState,
             @RequestParam(value="page", required=false, defaultValue="1") int page,
             HttpServletRequest request, HttpServletResponse response) {
-        String sesGroupIdx = LifeCenterSessionController.getSession( request, "sesGroupIdx" );
         BoardDTO dto = new BoardDTO();
         
         if (!selectState.equals("")) {
@@ -80,7 +79,6 @@ public class BoardController extends LifeCenterController {
         paging.paging(config, total, page, param);
         
         ModelAndView mv = setMV("notice/list");
-        mv.addObject("sesGroupIdx", sesGroupIdx);
         mv.addObject("list", list);
         mv.addObject("total", total);
         mv.addObject("selectState", selectState);
@@ -93,9 +91,9 @@ public class BoardController extends LifeCenterController {
     
     @RequestMapping("/notice/new")
     public ModelAndView boardNew(HttpServletRequest request, HttpServletResponse response) {
-        String sesGroupIdx = LifeCenterSessionController.getSession( request, "sesGroupIdx" );
+//        String sesGroupIdx = LifeCenterSessionController.getSession( request, "sesGroupIdx" );
         ModelAndView mv = setMV("notice/new");
-        mv.addObject("groupIdx",sesGroupIdx);
+//        mv.addObject("groupIdx",sesGroupIdx);
         
         return mv;
     }
@@ -107,12 +105,12 @@ public class BoardController extends LifeCenterController {
             @ModelAttribute("dto") final BoardDTO dto,
             MultipartFile file) {
         String sesId = LifeCenterSessionController.getSession(request, "sesId");
-        String sesGroupIdx = LifeCenterSessionController.getSession(request, "sesGroupIdx");
-        
-        if (!sesGroupIdx.equals("1")) {
-            LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '공지사항 작성 권한이 없습니다.', callBack : function(){ location.href='/notice/list'; } });" );
-            return "/common/blank";
-        }
+//        String sesGroupIdx = LifeCenterSessionController.getSession(request, "sesGroupIdx");
+//        
+//        if (!sesGroupIdx.equals("1")) {
+//            LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '공지사항 작성 권한이 없습니다.', callBack : function(){ location.href='/notice/list'; } });" );
+//            return "/common/blank";
+//        }
         
         if (file.isEmpty() == false) {
             UUID uuid = UUID.randomUUID();
@@ -170,7 +168,7 @@ public class BoardController extends LifeCenterController {
             @RequestParam(value="postSeq", required=false, defaultValue="") int postSeq,
             HttpServletRequest request, HttpServletResponse response) {
         String referer = request.getHeader("referer");
-        String sesGroupIdx = LifeCenterSessionController.getSession( request, "sesGroupIdx" );
+//        String sesGroupIdx = LifeCenterSessionController.getSession( request, "sesGroupIdx" );
         
         int total = boardService.selectNoticeBoardCountOne(postSeq);
         BoardDTO dto = new BoardDTO();
@@ -195,7 +193,7 @@ public class BoardController extends LifeCenterController {
         ModelAndView mv = setMV("notice/content");
         mv.addObject("filePath", config.filePath);
         mv.addObject("content", dto);
-        mv.addObject("groupIdx", sesGroupIdx);
+//        mv.addObject("groupIdx", sesGroupIdx);
         mv.addObject("prePostCnt", prePostCnt);
         mv.addObject("nextPostCnt", nextPostCnt);
         mv.addObject("prePost", preDto);
@@ -229,12 +227,12 @@ public class BoardController extends LifeCenterController {
     public String contentDelete(HttpServletRequest request, HttpServletResponse response,
             @RequestParam(value="postSeq", required=false, defaultValue="") int postSeq,
             @RequestParam(value="fileName", required=false, defaultValue="") String fileName) {
-        String sesGroupIdx = LifeCenterSessionController.getSession(request, "sesGroupIdx");
+//        String sesGroupIdx = LifeCenterSessionController.getSession(request, "sesGroupIdx");
         
-        if (!sesGroupIdx.equals("1")) {
-            LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '해당 글을 삭제할 수 없습니다.', callBack : function(){ location.href='/notice/list'; } });" );
-            return "/common/blank";
-        }
+//        if (!sesGroupIdx.equals("1")) {
+//            LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '해당 글을 삭제할 수 없습니다.', callBack : function(){ location.href='/notice/list'; } });" );
+//            return "/common/blank";
+//        }
         
         BoardDTO dto = new BoardDTO();
         dto.setPostSeq(postSeq);
@@ -283,12 +281,11 @@ public class BoardController extends LifeCenterController {
             MultipartFile file) {
         
         String sesId = LifeCenterSessionController.getSession(request, "sesId");
-        String sesGroupIdx = LifeCenterSessionController.getSession(request, "sesGroupIdx");
-        
-        if (!sesGroupIdx.equals("1")) {
-            LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '공지사항 수정 권한이 없습니다.', callBack : function(){ location.href='./list'; } });" );
-            return "/common/blank";
-        }
+//        String sesGroupIdx = LifeCenterSessionController.getSession(request, "sesGroupIdx");
+//        if (!sesGroupIdx.equals("1")) {
+//            LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '공지사항 수정 권한이 없습니다.', callBack : function(){ location.href='./list'; } });" );
+//            return "/common/blank";
+//        }
         
         int postSeq = dto.getPostSeq();
         
@@ -500,12 +497,12 @@ public class BoardController extends LifeCenterController {
     public String boardQnaAnswer(HttpServletRequest request, HttpServletResponse response,
             @ModelAttribute("dto") final BoardDTO dto) {
 
-        String sesGroupIdx = LifeCenterSessionController.getSession(request, "sesGroupIdx");
-        
-        if (!sesGroupIdx.equals("1")) {
-            LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '권한이 없습니다.', callBack : function(){ location.href='./list'; } });" );
-            return "/common/blank";
-        }
+//        String sesGroupIdx = LifeCenterSessionController.getSession(request, "sesGroupIdx");
+//        
+//        if (!sesGroupIdx.equals("1")) {
+//            LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '권한이 없습니다.', callBack : function(){ location.href='./list'; } });" );
+//            return "/common/blank";
+//        }
 
         boardService.qnaAnswerInsert(dto);
         
@@ -516,12 +513,12 @@ public class BoardController extends LifeCenterController {
     public String boardQnaAnswerDelete(HttpServletRequest request, HttpServletResponse response,
             @ModelAttribute("dto") final BoardDTO dto) {
         
-        String sesGroupIdx = LifeCenterSessionController.getSession(request, "sesGroupIdx");
-        
-        if (!sesGroupIdx.equals("1")) {
-            LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '권한이 없습니다.', callBack : function(){ location.href='./list'; } });" );
-            return "/common/blank";
-        }
+//        String sesGroupIdx = LifeCenterSessionController.getSession(request, "sesGroupIdx");
+//        
+//        if (!sesGroupIdx.equals("1")) {
+//            LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '권한이 없습니다.', callBack : function(){ location.href='./list'; } });" );
+//            return "/common/blank";
+//        }
         
         dto.setAnswerContent("");
         boardService.qnaAnswerInsert(dto);
@@ -616,15 +613,20 @@ public class BoardController extends LifeCenterController {
             @RequestParam(value="fileName", required=false, defaultValue="") String fileName) {
         
         String sesId = LifeCenterSessionController.getSession(request, "sesId");
-        String sesGroupIdx = LifeCenterSessionController.getSession(request, "sesGroupIdx");
+//        String sesGroupIdx = LifeCenterSessionController.getSession(request, "sesGroupIdx");
         
-        if (!sesGroupIdx.equals("1")) {
-            if (!sesId.equals(createBy)) {
-                LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '해당 글을 삭제할 수 없습니다.', callBack : function(){ location.href='/qna/list'; } });" );
-                return "/common/blank";
-            }
+        if (!sesId.equals(createBy)) {
+            LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '해당 글을 삭제할 수 없습니다.', callBack : function(){ location.href='/qna/list'; } });" );
+            return "/common/blank";
         }
         
+//        if (!sesGroupIdx.equals("1")) {
+//            if (!sesId.equals(createBy)) {
+//                LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '해당 글을 삭제할 수 없습니다.', callBack : function(){ location.href='/qna/list'; } });" );
+//                return "/common/blank";
+//            }
+//        }
+        
         
         BoardDTO dto = new BoardDTO();
         dto.setPostSeq(postSeq);

src/main/java/com/lemon/lifecenter/controller/MobileMenuController.java

@@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.lemon.lifecenter.common.LifeCenterController;
@@ -26,7 +27,7 @@ public class MobileMenuController extends LifeCenterController {
     private PatientService patientService;
     
     @RequestMapping("/menu")
-    public ModelAndView menu(
+    public ModelAndView menu(@RequestParam(value="redirectUrl", required=false, defaultValue="") String redirectUrl,
             HttpServletRequest request, HttpServletResponse response) {
         String patientId = LifeCenterSessionController.getSession(request, "sesMId");
         String roomId = LifeCenterSessionController.getSession(request, "sesMRoomNum");
@@ -45,6 +46,7 @@ public class MobileMenuController extends LifeCenterController {
         mv.addObject("name", patientName);
         mv.addObject("munjinCnt", cnt);
         mv.addObject("centerName", sesMCenterName);
+        mv.addObject("redirectUrl", redirectUrl);
         return mv;
     }
     

src/main/webapp/WEB-INF/jsp/mobile/menu/menu.jsp

@@ -7,6 +7,10 @@
 
 $( function(){
     token( "getToken" );
+    var redirectUrl = "<c:out value='${redirectUrl}' />" ;
+    if (redirectUrl != "") {
+        location.href = "./" + redirectUrl;
+    }
 });
 
 function getToken(token, deviceType, macAddress) {

src/main/webapp/WEB-INF/jsp/notice/new.jsp

@@ -34,10 +34,10 @@ $( function(){
             form.submit();
         }
     });
-    var groupIdx = "<c:out value='${groupIdx}'/>";
-    if (groupIdx != "1") {
-        alertBox({ txt : '공지사항 작성 권한이 없습니다.', callBack : function(){ location.href='./list' } });
-    }
+//     var groupIdx = "<c:out value='${groupIdx}'/>";
+//     if (groupIdx != "1") {
+//         alertBox({ txt : '공지사항 작성 권한이 없습니다.', callBack : function(){ location.href='./list' } });
+//     }
     
 })