|
1 | 1 | import DBcrud from "./utils/DBcrud.js"; |
2 | 2 | import fetch from "./utils/fetch.js"; |
3 | | -import {customTimePicker, calTime, colorScale} from "./utils/utilities.js" |
| 3 | +import {customTimePicker, calTime, colorScale, convertDateFormat} from "./utils/utilities.js" |
4 | 4 | const db = new DBcrud(); |
5 | 5 | var modalHasShow = false |
6 | 6 |
|
@@ -124,7 +124,7 @@ const returnCard = (cards) => { |
124 | 124 | <div class="modal-dialog modal-dialog-centered" role="document"> |
125 | 125 | <div class="modal-content"> |
126 | 126 | <div class="modal-header" style="background-color:${colorScale(perc)};" > |
127 | | - <h5 class="modal-title" id="exampleModalLongTitle">Due ${`${card.start} ${card.time.H}:${card.time.M}`}</h5> |
| 127 | + <h5 class="modal-title" id="exampleModalLongTitle">Due ${`${convertDateFormat(card.start)} ${card.time.H}:${card.time.M}`}</h5> |
128 | 128 | <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"> |
129 | 129 | <span aria-hidden="true">×</span> |
130 | 130 | </button> |
@@ -175,13 +175,13 @@ const returnDoneCard = (cards) => { |
175 | 175 | <div class="modal-dialog modal-dialog-centered" role="document"> |
176 | 176 | <div class="modal-content"> |
177 | 177 | <div class="modal-header" style="background-color: gray;" > |
178 | | - <h5 class="modal-title" id="exampleModalLongTitle">Due ${`${card.start} ${card.time.H}:${card.time.M}`}</h5> |
| 178 | + <h5 class="modal-title" id="exampleModalLongTitle">Due ${`${convertDateFormat(card.start)} ${card.time.H}:${card.time.M}`}</h5> |
179 | 179 | <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"> |
180 | 180 | <span aria-hidden="true">×</span> |
181 | 181 | </button> |
182 | 182 | </div> |
183 | 183 | <div class="modal-body"> |
184 | | - <p class="due-text">Done : ${card.done}</p> |
| 184 | + <p class="due-text">Done : ${convertDateFormat((card.done.split(" "))[0])} ${(card.done.split(" "))[1]}</p> |
185 | 185 | <h6>${card.title}</h6> |
186 | 186 | <p>"${card.detail}"</p> |
187 | 187 | </div> |
|
0 commit comments