refactor: change label/field name
parent
2f81f99ded
commit
c7a3c597b2
|
|
@ -119,14 +119,14 @@ namespace BpsRwApp.Controllers
|
||||||
|
|
||||||
var totalJumlahPjlp = targets.Sum(target => target.JumlahPjlp);
|
var totalJumlahPjlp = targets.Sum(target => target.JumlahPjlp);
|
||||||
var totalTargetBulan = targets.Sum(target => target.TargetBulan);
|
var totalTargetBulan = targets.Sum(target => target.TargetBulan);
|
||||||
var totalTargetDelapanBulan = targets.Sum(target => target.TargetDelapanBulan);
|
var totalTargetTahun = targets.Sum(target => target.TargetTahun);
|
||||||
|
|
||||||
return new WilayahRow(
|
return new WilayahRow(
|
||||||
No: wilayahIndex + 1,
|
No: wilayahIndex + 1,
|
||||||
Wilayah: definition.Name,
|
Wilayah: definition.Name,
|
||||||
TotalJumlahPjlp: totalJumlahPjlp,
|
TotalJumlahPjlp: totalJumlahPjlp,
|
||||||
TotalTargetBulan: totalTargetBulan,
|
TotalTargetBulan: totalTargetBulan,
|
||||||
TotalTargetDelapanBulan: totalTargetDelapanBulan,
|
TotalTargetTahun: totalTargetTahun,
|
||||||
Targets: targets);
|
Targets: targets);
|
||||||
})
|
})
|
||||||
.ToArray();
|
.ToArray();
|
||||||
|
|
@ -140,19 +140,19 @@ namespace BpsRwApp.Controllers
|
||||||
kelurahan = target.Kelurahan,
|
kelurahan = target.Kelurahan,
|
||||||
jumlah_pjlp = target.JumlahPjlp,
|
jumlah_pjlp = target.JumlahPjlp,
|
||||||
target_bulan = target.TargetBulan,
|
target_bulan = target.TargetBulan,
|
||||||
target_8_bulan = target.TargetDelapanBulan,
|
target_tahun = target.TargetTahun,
|
||||||
total_jumlah_pjlp = region.TotalJumlahPjlp,
|
total_jumlah_pjlp = region.TotalJumlahPjlp,
|
||||||
total_target_bulan = region.TotalTargetBulan,
|
total_target_bulan = region.TotalTargetBulan,
|
||||||
total_target_8_bulan = region.TotalTargetDelapanBulan
|
total_target_tahun = region.TotalTargetTahun
|
||||||
}))
|
}))
|
||||||
.ToArray();
|
.ToArray();
|
||||||
|
|
||||||
return Json(new { data });
|
return Json(new { data });
|
||||||
}
|
}
|
||||||
|
|
||||||
private sealed record WilayahRow(int No, string Wilayah, int TotalJumlahPjlp, int TotalTargetBulan, int TotalTargetDelapanBulan, TargetRow[] Targets);
|
private sealed record WilayahRow(int No, string Wilayah, int TotalJumlahPjlp, int TotalTargetBulan, int TotalTargetTahun, TargetRow[] Targets);
|
||||||
|
|
||||||
private sealed record TargetRow(string Kelurahan, int JumlahPjlp, int TargetBulan, int TargetDelapanBulan);
|
private sealed record TargetRow(string Kelurahan, int JumlahPjlp, int TargetBulan, int TargetTahun);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,7 @@
|
||||||
<th class="w-[35%]">Wilayah</th>
|
<th class="w-[35%]">Wilayah</th>
|
||||||
<th class="w-[20%]">Jumlah PJLP Pendamping BPS RW</th>
|
<th class="w-[20%]">Jumlah PJLP Pendamping BPS RW</th>
|
||||||
<th class="w-[20%]">Target Rumah Memilah per Bulan</th>
|
<th class="w-[20%]">Target Rumah Memilah per Bulan</th>
|
||||||
<th class="w-[20%]">Target Rumah Memilah 8 Bulan</th>
|
<th class="w-[20%]">Target Rumah Memilah per Tahun</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody></tbody>
|
<tbody></tbody>
|
||||||
|
|
@ -122,7 +122,7 @@
|
||||||
row.append(`<td class="align-middle">${group}</td>`);
|
row.append(`<td class="align-middle">${group}</td>`);
|
||||||
row.append(`<td class="align-middle">${formatNumber(firstRow.total_jumlah_pjlp)}</td>`);
|
row.append(`<td class="align-middle">${formatNumber(firstRow.total_jumlah_pjlp)}</td>`);
|
||||||
row.append(`<td class="align-middle">${formatNumber(firstRow.total_target_bulan)}</td>`);
|
row.append(`<td class="align-middle">${formatNumber(firstRow.total_target_bulan)}</td>`);
|
||||||
row.append(`<td class="align-middle">${formatNumber(firstRow.total_target_8_bulan)}</td>`);
|
row.append(`<td class="align-middle">${formatNumber(firstRow.total_target_tahun)}</td>`);
|
||||||
|
|
||||||
return row;
|
return row;
|
||||||
}
|
}
|
||||||
|
|
@ -150,7 +150,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
data: 'target_8_bulan',
|
data: 'target_tahun',
|
||||||
render: function (data) {
|
render: function (data) {
|
||||||
return formatNumber(data);
|
return formatNumber(data);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue