java
/
bf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

d-day 체크리스트 사항 수정

Browse Source
dev_bert
jonghwan76 3 years ago
parent 79019bccb0
commit 06ef3d48b0
3 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File

22
.idea/workspace.xml
Unescape View File

@ -9,11 +9,10 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="공유기능 퍼블리싱 및 기능 적용"> <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="이유식당 홈 기록이미지 노출변경(최초 등록된것으로), 이후에 대표이미지로 변경해야함.">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/bf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_d_day.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_d_day.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -221,7 +220,7 @@
<workItem from="1650099253570" duration="21674000" /> <workItem from="1650099253570" duration="21674000" />
<workItem from="1650210956375" duration="846000" /> <workItem from="1650210956375" duration="846000" />
<workItem from="1650243545918" duration="874000" /> <workItem from="1650243545918" duration="874000" />
<workItem from="1650278800214" duration="13150000" /> <workItem from="1650278800214" duration="17415000" />
</task> </task>
<task id="LOCAL-00001" summary="최초 커밋"> <task id="LOCAL-00001" summary="최초 커밋">
<created>1645354476031</created> <created>1645354476031</created>
@ -482,7 +481,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1650286771669</updated> <updated>1650286771669</updated>
</task> </task>
<option name="localTasksCounter" value="38" /> <task id="LOCAL-00038" summary="이유식당 홈 기록이미지 노출변경(최초 등록된것으로), 이후에 대표이미지로 변경해야함.">
<created>1650292837211</created>
<option name="number" value="00038" />
<option name="presentableId" value="LOCAL-00038" />
<option name="project" value="LOCAL" />
<updated>1650292837211</updated>
</task>
<option name="localTasksCounter" value="39" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -502,7 +508,6 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" /> <option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="닉네임 변경기능 적용" />
<MESSAGE value="계정 동기화 기능 수정" /> <MESSAGE value="계정 동기화 기능 수정" />
<MESSAGE value="홈화면 퍼블리싱 기능 적용" /> <MESSAGE value="홈화면 퍼블리싱 기능 적용" />
<MESSAGE value="카카오,네이버 로그인 연동 설정 - 개발사이트(가온앤 아이디)" /> <MESSAGE value="카카오,네이버 로그인 연동 설정 - 개발사이트(가온앤 아이디)" />
@ -527,6 +532,7 @@
<MESSAGE value="회원가입 밸리데이션 및 유효성체크 보완" /> <MESSAGE value="회원가입 밸리데이션 및 유효성체크 보완" />
<MESSAGE value="회원가입 밸리데이션 및 유효성체크 보완 - 2" /> <MESSAGE value="회원가입 밸리데이션 및 유효성체크 보완 - 2" />
<MESSAGE value="공유기능 퍼블리싱 및 기능 적용" /> <MESSAGE value="공유기능 퍼블리싱 및 기능 적용" />
<option name="LAST_COMMIT_MESSAGE" value="공유기능 퍼블리싱 및 기능 적용" /> <MESSAGE value="이유식당 홈 기록이미지 노출변경(최초 등록된것으로), 이후에 대표이미지로 변경해야함." />
<option name="LAST_COMMIT_MESSAGE" value="이유식당 홈 기록이미지 노출변경(최초 등록된것으로), 이후에 대표이미지로 변경해야함." />
</component> </component>
</project> </project>

19
src/main/java/com/backoffice/m/member_env/M_Member_envController.java
Unescape View File

@ -158,8 +158,7 @@ public class M_Member_envController extends AbstractControllerManager{
} }
@RequestMapping(value="setting_env_viewnm") @RequestMapping(value="setting_env_viewnm")
public String setting_env_viewnm(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response public String setting_env_viewnm(@ModelAttribute("model") ModelMap model, HttpServletRequest request, RedirectAttributes ra) {
, RedirectAttributes ra) {
DataMap paramMap = gmUtil.getDataMapFromRequest(request); DataMap paramMap = gmUtil.getDataMapFromRequest(request);
String view_nm = RenaStringUtil.getData(paramMap, "view_nm"); String view_nm = RenaStringUtil.getData(paramMap, "view_nm");
@ -187,6 +186,21 @@ public class M_Member_envController extends AbstractControllerManager{
} else if(view_nm.equals("view_set_music")) { //음악설정 } else if(view_nm.equals("view_set_music")) { //음악설정
List<DataMap> music_list = member_envBO.select_music_list(paramMap); List<DataMap> music_list = member_envBO.select_music_list(paramMap);
DataMap.putToModel(model, "music_list", music_list); DataMap.putToModel(model, "music_list", music_list);
} else if(view_nm.equals("view_d_day")) { //D-Day 등록
DataMap dataMap = new DataMap();
//세팅된 년도,월이 없으면
if(paramMap.get("viewYear") == null || paramMap.get("viewMonth") == null) {
String viewYear = DateUtil.getTodayAddDate(0,"yyyy");
String viewMonth = DateUtil.getTodayAddDate(0,"MM");
dataMap.put("viewYear", viewYear);
dataMap.put("viewMonth", viewMonth);
} else {
dataMap.put("viewYear", paramMap.get("viewYear"));
dataMap.put("viewMonth", paramMap.get("viewMonth"));
}
DataMap.putToModel(model, "today", dataMap);
} }
DataMap.putToModel(model, "rm_mem", rm_mem); DataMap.putToModel(model, "rm_mem", rm_mem);
@ -794,7 +808,6 @@ public class M_Member_envController extends AbstractControllerManager{
* D-Day 신규 등록 * D-Day 신규 등록
* @param model * @param model
* @param request * @param request
* @param response
* @return * @return
*/ */
@RequestMapping(value="ajax_insert_dday") @RequestMapping(value="ajax_insert_dday")

21
src/main/webapp/WEB-INF/views/ftl/m/member_env/view_d_day.ftl
Unescape View File

@ -75,12 +75,13 @@
<script> <script>
// -------- 캘린더 로직 -------- // -------- 캘린더 로직 --------
// Date 객체 생성 // Date 객체 생성
let date = new Date(); let date = new Date("${model['today']['viewYear']}", parseInt("${model['today']['viewMonth']}") - 1);
let schedule = []; let schedule = [];
const renderCalendar = () => { const renderCalendar = () => {
const viewYear = date.getFullYear(); const viewYear = date.getFullYear();
const viewMonth = date.getMonth(); const viewMonth = date.getMonth();
// console.log(viewYear + "," + viewMonth);
// year, month 채우기 // year, month 채우기
document.querySelector('.year').textContent = viewYear; document.querySelector('.year').textContent = viewYear;
@ -217,6 +218,8 @@
//신규 등록 //신규 등록
function fncInsert() { function fncInsert() {
var dayArr = $("#d_day").val().split("/");
$.ajax({ $.ajax({
url:'${URL_ROOT}/m/member_env/ajax_insert_dday.do', url:'${URL_ROOT}/m/member_env/ajax_insert_dday.do',
type:'get', type:'get',
@ -230,7 +233,9 @@
}, },
success:function(result){ success:function(result){
if(result.RESULT == "1") { if(result.RESULT == "1") {
Swal.fire({text: '정상적으로 등록 되었습니다.'}).then((result)=>{ location.reload(); }) Swal.fire({text: '정상적으로 등록 되었습니다.'}).then((result)=>{
location.href='${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=' + dayArr[0] + "&viewMonth=" + dayArr[1];
})
} else { } else {
console.log(result); console.log(result);
Swal.fire({text: '등록되지 않았습니다.'}); Swal.fire({text: '등록되지 않았습니다.'});
@ -242,6 +247,8 @@
//수정 //수정
function fncModify() { function fncModify() {
var dayArr = $("#d_day").val().split("/");
$.ajax({ $.ajax({
url:'${URL_ROOT}/m/member_env/ajax_update_dday.do', url:'${URL_ROOT}/m/member_env/ajax_update_dday.do',
type:'get', type:'get',
@ -256,7 +263,9 @@
}, },
success:function(result){ success:function(result){
if(result.RESULT == "1") { if(result.RESULT == "1") {
Swal.fire({text: '정상적으로 수정 되었습니다.'}).then((result)=>{ location.reload(); }) Swal.fire({text: '정상적으로 수정 되었습니다.'}).then((result)=>{
location.href='${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=' + dayArr[0] + "&viewMonth=" + dayArr[1];
})
} else { } else {
console.log(result); console.log(result);
Swal.fire({text: '저장되지 않았습니다.'}); Swal.fire({text: '저장되지 않았습니다.'});
@ -267,6 +276,8 @@
//삭제 //삭제
function fncDelete() { function fncDelete() {
var dayArr = $("#d_day").val().split("/");
$.ajax({ $.ajax({
url:'${URL_ROOT}/m/member_env/ajax_delete_dday.do', url:'${URL_ROOT}/m/member_env/ajax_delete_dday.do',
type:'get', type:'get',
@ -279,7 +290,9 @@
success:function(result){ success:function(result){
console.log(result); console.log(result);
if(result.RESULT == "1") { if(result.RESULT == "1") {
Swal.fire({text: '정상적으로 삭제 되었습니다.'}).then((result)=>{ location.reload(); }) Swal.fire({text: '정상적으로 삭제 되었습니다.'}).then((result)=>{
location.href='${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=' + dayArr[0] + "&viewMonth=" + dayArr[1];
})
} else { } else {
console.log(result); console.log(result);
Swal.fire({text: '삭제되지 않았습니다.'}); Swal.fire({text: '삭제되지 않았습니다.'});

Write Preview
Loading…
Cancel
Save