Skip to content

Commit b9841f2

Browse files
authored
Merge pull request #22 from trihatmaja/add-day-to-tanggal
Add Day Name
2 parents e00a4c6 + 699f722 commit b9841f2

2 files changed

Lines changed: 30 additions & 2 deletions

File tree

app.js

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ app.get("/api", async (req, res) => {
2828
const files = await readdirAsync(path.join(__dirname, "data"));
2929
const filename = files.find((file) => file.includes(year));
3030

31+
const options = {
32+
weekday: 'long', // nama hari
33+
year: 'numeric',
34+
month: 'long',
35+
day: 'numeric',
36+
timeZone: 'Asia/Jakarta'
37+
};
38+
3139
if (filename) {
3240
const rawData = await readFileAsync(
3341
path.join(__dirname, "data", `${year}.json`)
@@ -42,14 +50,33 @@ app.get("/api", async (req, res) => {
4250
});
4351
if (params.month) {
4452
console.log("month");
45-
const filterData = data.filter((item) => {
53+
const filterData = data
54+
.filter((item) => {
4655
const tanggal = new Date(item.tanggal);
4756
const monthNum = tanggal.getMonth() + 1;
4857
return monthNum == params.month;
58+
})
59+
.map(item =>{
60+
const tanggal = new Date(item.tanggal);
61+
return {
62+
tanggal: item.tanggal,
63+
tanggal_display: tanggal.toLocaleDateString('id-ID', options),
64+
keterangan: item.keterangan,
65+
is_cuti: item.is_cuti
66+
}
4967
});
5068
res.json(filterData);
5169
} else {
5270
console.log("data dari file json");
71+
data = data.map(item => {
72+
const tanggal = new Date(item.tanggal);
73+
return {
74+
tanggal: item.tanggal,
75+
tanggal_display: tanggal.toLocaleDateString('id-ID', options),
76+
keterangan: item.keterangan,
77+
is_cuti: item.is_cuti
78+
}
79+
})
5380
res.json(data);
5481
}
5582
} else {

public/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ <h3 class="text-xl font-bold text-yellow-500">Format Response</h3>
1818
<pre class="bg-gray-200 p-4 rounded-lg mt-2 text-sm">
1919
{
2020
"tanggal": "2023-01-1",
21+
"tanggal_display": "Minggu, 1 Januari 2023",
2122
"keterangan": "Tahun Baru 2023",
22-
"is_cuti": true or false
23+
"is_cuti": false
2324
}
2425
</pre>
2526
</div>

0 commit comments

Comments
 (0)