Skip to content

Commit f95902f

Browse files
committed
Change display date format
1 parent e646c81 commit f95902f

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

src/calendar.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import fetch from "./utils/fetch.js"
22
import DBcrud from "./utils/DBcrud.js"
3-
import { customTimePicker } from "./utils/utilities.js"
3+
import { customTimePicker, convertDateFormat } from "./utils/utilities.js"
44
const db = new DBcrud()
55
const alertModal = new bootstrap.Modal('#alertModal')
66
const confirmButton = document.getElementById("confirm-change")
@@ -13,7 +13,7 @@ const addTaskCalendarModal = (date) => {
1313
<div class="modal-dialog modal-dialog-centered">
1414
<div class="modal-content">
1515
<div class="modal-header">
16-
<h5 class="modal-title">Add Task on ${date}</h5>
16+
<h5 class="modal-title">Add Task on ${convertDateFormat(date)}</h5>
1717
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
1818
<span aria-hidden="true">&times;</span>
1919
</button>
@@ -71,7 +71,7 @@ const taskDetailCalendarModal = (task) => {
7171
<div class="modal-dialog modal-dialog-centered" role="document">
7272
<div class="modal-content">
7373
<div class="modal-header" style="background-color:${task.color};" >
74-
<h5 class="modal-title" id="exampleModalLongTitle">Due ${`${task.start} ${task.time.H}:${task.time.M}`}</h5>
74+
<h5 class="modal-title" id="exampleModalLongTitle">Due ${`${convertDateFormat(task.start)} ${task.time.H}:${task.time.M}`}</h5>
7575
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
7676
<span aria-hidden="true">&times;</span>
7777
</button>

src/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import DBcrud from "./utils/DBcrud.js";
22
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"
44
const db = new DBcrud();
55
var modalHasShow = false
66

@@ -124,7 +124,7 @@ const returnCard = (cards) => {
124124
<div class="modal-dialog modal-dialog-centered" role="document">
125125
<div class="modal-content">
126126
<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>
128128
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
129129
<span aria-hidden="true">&times;</span>
130130
</button>
@@ -175,13 +175,13 @@ const returnDoneCard = (cards) => {
175175
<div class="modal-dialog modal-dialog-centered" role="document">
176176
<div class="modal-content">
177177
<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>
179179
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
180180
<span aria-hidden="true">&times;</span>
181181
</button>
182182
</div>
183183
<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>
185185
<h6>${card.title}</h6>
186186
<p>"${card.detail}"</p>
187187
</div>

src/utils/utilities.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ const calTime = (d, h, m) => {
3434
return Math.round(difDate / (1000 * 60));
3535
};
3636

37+
//convert date time format
38+
const convertDateFormat = (date) =>{
39+
var d = new Date(date);
40+
var strArray = d.toString().split(" ").slice(0, 4)
41+
return `${strArray[0]} ${strArray[2]} ${strArray[1]} ${strArray[3]}`
42+
}
43+
3744
//calculate the code color for each task by its different time from current time
3845
const colorScale = (perc) => {
3946
var r, g, b = 0;
@@ -48,4 +55,4 @@ const colorScale = (perc) => {
4855
return "#" + ("000000" + h.toString(16)).slice(-6);
4956
};
5057

51-
export {customTimePicker, calTime, colorScale}
58+
export {customTimePicker, calTime, colorScale, convertDateFormat}

0 commit comments

Comments
 (0)