Skip to content

hotfix : remainingTodoView의 월 제대로 못 받아오는 오류 수정 #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
srn13542 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

hotfix : remainingTodoView의 월 제대로 못 받아오는 오류 수정 #76

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions forever_planner/src/views/remainingTodoThing/RemainingThingTodoList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div v-for="(todo, index) in remainingTodos" :key="index" class="batchRemainingTodo" >
<div v-if = "!todo.post.isFinished.value" class="todoItem">
<b><p class="batchP">D<span class="remainingDate">{{ fixDaycount(todo.daycount) }}</span></p></b>
<p class="remainingTodoDate">7월 {{ todo.calendarDate }}일</p>
<p class="remainingTodoDate">{{ checkMonth(currentMonth, fixDaycount(todo.daycount) ) }}월 {{ todo.calendarDate }}일</p>
<button type="button" class="todoEditBtn" @click="todaysTodoDateClick" :style="borderColor(todo.post.category.categoryColor)">
<p class="todoTag">{{ todo.post.category.categoryTitle }}</p>
<p class="todoTxt">{{ todo.post.title }}</p>
Expand All @@ -29,6 +29,8 @@ const store = useStore();
const { colors } = storeToRefs(store);
const { getColors } = store;
const { changeFinishedState } = store;
const { currentMonth } = storeToRefs(useStore());
const currentDate = ref(new Date().getDate() );

const usingTheme = ref(null);

Expand All @@ -39,16 +41,34 @@ const props = defineProps({
}
})

const checkMonth = ( currentMonth, dayCount ) => {
const targetDate = (currentDate.value+parseInt(dayCount))*(-1);
console.log(targetDate);

var date = new Date();
var lastDay = new Date(date.getFullYear(), date.getMonth() + 1, 0);

if( targetDate <= (lastDay-currentDate.value) && targetDate >= 1){
return currentMonth;
}else if( targetDate > lastDay) {
if(currentMonth == 12){
return 1;
}else{
return currentMonth+1;
}
}else if ( targetDate < 1){
if(currentMonth == 12){
return 11;
}else{
return currentMonth-1;
}
}
}

const fixDaycount = (daycount) => {
return daycount.replace(/\+\-/g, '-');
}

const backgroundColor = (backgroundColor) => {
// console.log(backgroundColor);
//console.log(usingTheme.value);
// if (usingTheme.value == null) return { backgroundColor: '#ffffff' };
return { backgroundColor: usingTheme.value.colorList[backgroundColor].colorCode};
}

onMounted(async() => {
await getColors();
Expand Down