From dfc73abc2a9c7f7828541ac8026baa751f58b54a Mon Sep 17 00:00:00 2001
From: srnb1 <hanisky1@naver.com>
Date: Fri, 2 Aug 2024 06:37:55 +0900
Subject: [PATCH] =?UTF-8?q?hotfix=20:=20remainingTodoView=EC=9D=98=20?=
 =?UTF-8?q?=EC=9B=94=20=EC=A0=9C=EB=8C=80=EB=A1=9C=20=EB=AA=BB=20=EB=B0=9B?=
 =?UTF-8?q?=EC=95=84=EC=98=A4=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RemainingThingTodoList.vue                | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/forever_planner/src/views/remainingTodoThing/RemainingThingTodoList.vue b/forever_planner/src/views/remainingTodoThing/RemainingThingTodoList.vue
index abf3893e..7e88811b 100644
--- a/forever_planner/src/views/remainingTodoThing/RemainingThingTodoList.vue
+++ b/forever_planner/src/views/remainingTodoThing/RemainingThingTodoList.vue
@@ -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>
@@ -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);
 
@@ -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();