upd: api noc

Merge pull request 'upd : api noc dashboard' (#116 ) from amalia/16-mar-26 into main
Reviewed-on: #116
2026-03-17 15:38:44 +08:00 · 2026-03-16 16:13:12 +08:00 · 2026-03-16 16:06:08 +08:00 · 2026-02-06 17:46:25 +08:00 · 2026-02-06 14:39:58 +08:00
8 changed files with 533 additions and 156 deletions
--- a/src/components/surat/SKTempatUsaha.tsx
+++ b/src/components/surat/SKTempatUsaha.tsx
@@ -90,7 +90,7 @@ export default function SKTempatUsaha({ data }: { data: any }) {
          <Row label="Bidang Usaha" value={getValue("bidang_usaha")} />
          <Row label="Alamat Usaha" value={getValue("alamat_usaha")} />
          <Row label="Status Tempat Usaha" value={getValue("status_tempat")} />
-          <Row label="Luas Tempat Usaha" value={getValue("luas_usaha")} />
+          <Row label="Luas Tempat Usaha" value={getValue("luas_usaha") + " m2"} />
          <Row label="Jumlah Karyawan" value={getValue("jumlah_karyawan")} />
        </div>

--- a/src/index.tsx
+++ b/src/index.tsx
@@ -20,6 +20,7 @@ import SuratRoute from "./server/routes/surat_route";
 import TestPengaduanRoute from "./server/routes/test_pengaduan";
 import UserRoute from "./server/routes/user_route";
 import WargaRoute from "./server/routes/warga_route";
+import NocRoute from "./server/routes/noc_route";

 const Docs = new Elysia({
  tags: ["docs"],
@@ -47,7 +48,8 @@ const Api = new Elysia({
  .use(UserRoute)
  .use(LayananRoute)
  .use(AduanRoute)
-  .use(SendWaRoute);
+  .use(SendWaRoute)
+  .use(NocRoute);

 const app = new Elysia()
  .use(Api)
--- a/src/lib/categoryPelayananSurat.ts
+++ b/src/lib/categoryPelayananSurat.ts
@@ -9,87 +9,87 @@ export const categoryPelayananSurat = [
        key: "pengantar_kelian",
        name: "Pengantar Kelian",
        desc: "Surat Pengantar Kelian Banjar Dinas di Wilayah Masing-masing",
-        required: true
+        required: true, satuan: null
      },
      {
        key: "ktp_kk",
        name: "KTP / KK",
        desc: "Fotokopi KTP atau Kartu Keluarga",
-        required: true
+        required: true, satuan: null
      },
      {
        key: "dokumen_beda",
        name: "Dokumen Pendukung",
        desc: "Fotokopi dokumen yang terdapat perbedaan biodata (ijazah, sertifikat, dll)",
-        required: true
+        required: true, satuan: null
      }
    ],
    dataText: [],
    dataPelengkap: [
-      { key: "nik", name: "NIK", desc: "Nomor Induk Kependudukan", type: "number", required: true },
-      { key: "nama", name: "Nama Lengkap", desc: "Nama sesuai KTP", type: "text", required: true },
-      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir pemohon", type: "text", required: true },
-      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir pemohon", type: "date", required: true },
+      { key: "nik", name: "NIK", desc: "Nomor Induk Kependudukan", type: "number", required: true, satuan: null },
+      { key: "nama", name: "Nama Lengkap", desc: "Nama sesuai KTP", type: "text", required: true, satuan: null },
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir pemohon", type: "text", required: true, satuan: null },
+      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir pemohon", type: "date", required: true, satuan: null },
      {
        key: "jenis_kelamin",
        name: "Jenis Kelamin",
        desc: "Jenis kelamin pemohon",
        type: "enum",
        options: enumJenisKelamin,
-        required: true
+        required: true, satuan: null
      },
-      { key: "alamat", name: "Alamat", desc: "Alamat lengkap tempat tinggal", type: "text", required: true },
-      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan pemohon", type: "text", required: true },
+      { key: "alamat", name: "Alamat", desc: "Alamat lengkap tempat tinggal", type: "text", required: true, satuan: null },
+      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan pemohon", type: "text", required: true, satuan: null },
      {
        key: "dokumen",
        name: "Nama Dokumen",
        desc: "Jenis dokumen yang mengalami perbedaan biodata",
        type: "text",
-        required: true
+        required: true, satuan: null
      },
      {
        key: "data_dokumen",
        name: "Data Dokumen",
        desc: "Data dokumen yg berbeda",
        type: "text",
-        required: true
+        required: true, satuan: null
      },
-      { key: "dokumen_a", name: "Data pada Dokumen A", desc: "Data biodata pada dokumen pertama", type: "text", required: true },
-      { key: "dokumen_b", name: "Data pada Dokumen B", desc: "Data biodata pada dokumen kedua", type: "text", required: true }
+      { key: "dokumen_a", name: "Data pada Dokumen A", desc: "Data biodata pada dokumen pertama", type: "text", required: true, satuan: null },
+      { key: "dokumen_b", name: "Data pada Dokumen B", desc: "Data biodata pada dokumen kedua", type: "text", required: true, satuan: null }
    ]
  },
  {
    id: "skbelumkawin",
    name: "Surat Keterangan Belum Kawin",
    syaratDokumen: [
-      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true },
-      { key: "ktp_kk", name: "KTP / KK", desc: "Fotokopi KTP atau Kartu Keluarga", required: true },
-      { key: "akta_cerai", name: "Akta Cerai", desc: "Fotokopi akta cerai (jika berstatus janda/duda)", required: false }
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
+      { key: "ktp_kk", name: "KTP / KK", desc: "Fotokopi KTP atau Kartu Keluarga", required: true, satuan: null },
+      { key: "akta_cerai", name: "Akta Cerai", desc: "Fotokopi akta cerai (jika berstatus janda/duda)", required: false, satuan: null }
    ],
    dataText: [],
    dataPelengkap: [
-      { key: "nik", name: "NIK", desc: "Nomor Induk Kependudukan", type: "number", required: true },
-      { key: "nama", name: "Nama Lengkap", desc: "Nama sesuai KTP", type: "text", required: true },
-      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir pemohon", type: "text", required: true },
-      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir pemohon", type: "date", required: true },
+      { key: "nik", name: "NIK", desc: "Nomor Induk Kependudukan", type: "number", required: true, satuan: null },
+      { key: "nama", name: "Nama Lengkap", desc: "Nama sesuai KTP", type: "text", required: true, satuan: null },
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir pemohon", type: "text", required: true, satuan: null },
+      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir pemohon", type: "date", required: true, satuan: null },
      {
        key: "jenis_kelamin",
        name: "Jenis Kelamin",
        desc: "Jenis kelamin pemohon",
        type: "enum",
        options: enumJenisKelamin,
-        required: true
+        required: true, satuan: null
      },
-      { key: "alamat", name: "Alamat", desc: "Alamat tempat tinggal", type: "text", required: true },
+      { key: "alamat", name: "Alamat", desc: "Alamat tempat tinggal", type: "text", required: true, satuan: null },
      {
        key: "agama",
        name: "Agama",
        desc: "Agama pemohon",
        type: "enum",
        options: enumAgama,
-        required: true
+        required: true, satuan: null
      },
-      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan pemohon", type: "text", required: true }
+      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan pemohon", type: "text", required: true, satuan: null }
    ]
  },

@@ -97,79 +97,79 @@ export const categoryPelayananSurat = [
    id: "skdomisiliorganisasi",
    name: "Surat Keterangan Domisili Organisasi",
    syaratDokumen: [
-      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true },
-      { key: "skt_organisasi", name: "SKT Organisasi", desc: "Fotokopi SKT Organisasi", required: true },
-      { key: "susunan_pengurus", name: "Susunan Pengurus", desc: "Susunan pengurus organisasi", required: true }
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
+      { key: "skt_organisasi", name: "SKT Organisasi", desc: "Fotokopi SKT Organisasi", required: true, satuan: null },
+      { key: "susunan_pengurus", name: "Susunan Pengurus", desc: "Susunan pengurus organisasi", required: true, satuan: null }
    ],
    dataText: [],
    dataPelengkap: [
-      { key: "nama_organisasi", name: "Nama Organisasi", desc: "Nama resmi organisasi", type: "text", required: true },
-      { key: "jenis_organisasi", name: "Jenis Organisasi", desc: "Jenis organisasi", type: "text", required: true },
-      { key: "alamat_organisasi", name: "Alamat Organisasi", desc: "Alamat sekretariat", type: "text", required: true },
-      { key: "no_telepon", name: "Nomor Telepon", desc: "Nomor telepon organisasi", type: "text", required: true },
-      { key: "nama_pimpinan", name: "Nama Pimpinan", desc: "Nama pimpinan", type: "text", required: true },
-      { key: "keperluan", name: "Keperluan", desc: "Keperluan pembuatan surat", type: "text", required: true }
+      { key: "nama_organisasi", name: "Nama Organisasi", desc: "Nama resmi organisasi", type: "text", required: true, satuan: null },
+      { key: "jenis_organisasi", name: "Jenis Organisasi", desc: "Jenis organisasi", type: "text", required: true, satuan: null },
+      { key: "alamat_organisasi", name: "Alamat Organisasi", desc: "Alamat sekretariat", type: "text", required: true, satuan: null },
+      { key: "no_telepon", name: "Nomor Telepon", desc: "Nomor telepon organisasi", type: "text", required: true, satuan: null },
+      { key: "nama_pimpinan", name: "Nama Pimpinan", desc: "Nama pimpinan", type: "text", required: true, satuan: null },
+      { key: "keperluan", name: "Keperluan", desc: "Keperluan pembuatan surat", type: "text", required: true, satuan: null }
    ]
  },
  {
    id: "skkelahiran",
    name: "Surat Keterangan Kelahiran",
    syaratDokumen: [
-      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true },
-      { key: "surat_lahir", name: "Surat Keterangan Lahir", desc: "Surat keterangan lahir dari bidan/dokter (jika ada)", required: false }
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
+      { key: "surat_lahir", name: "Surat Keterangan Lahir", desc: "Surat keterangan lahir dari bidan/dokter (jika ada)", required: false, satuan: null }
    ],
    dataText: [],
    dataPelengkap: [
-      { key: "nama_anak", name: "Nama Anak", desc: "Nama bayi/anak", type: "text", required: true },
-      { key: "tanggal_lahir_anak", name: "Tanggal Lahir Anak", desc: "Tanggal lahir anak", type: "date", required: true },
-      { key: "pukul_lahir", name: "Pukul Lahir", desc: "Waktu kelahiran", type: "text", required: true },
-      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat kelahiran", type: "text", required: true },
+      { key: "nama_anak", name: "Nama Anak", desc: "Nama bayi/anak", type: "text", required: true, satuan: null },
+      { key: "tanggal_lahir_anak", name: "Tanggal Lahir Anak", desc: "Tanggal lahir anak", type: "date", required: true, satuan: null },
+      { key: "pukul_lahir", name: "Pukul Lahir", desc: "Waktu kelahiran", type: "text", required: true, satuan: null },
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat kelahiran", type: "text", required: true, satuan: null },
      {
        key: "jenis_kelamin",
        name: "Jenis Kelamin Anak",
        desc: "Jenis kelamin anak",
        type: "enum",
        options: enumJenisKelamin,
-        required: true
+        required: true, satuan: null
      },
-      { key: "anak_ke", name: "Anak Ke-", desc: "Urutan kelahiran", type: "number", required: true },
-      { key: "nik_ibu", name: "NIK Ibu", desc: "NIK ibu kandung", type: "number", required: true },
-      { key: "nama_ibu", name: "Nama Ibu", desc: "Nama ibu kandung", type: "text", required: true },
-      { key: "tempat_lahir_ibu", name: "Tempat Lahir Ibu", desc: "Tempat lahir ibu", type: "text", required: true },
-      { key: "tanggal_lahir_ibu", name: "Tanggal Lahir Ibu", desc: "Tanggal lahir ibu", type: "date", required: true },
-      { key: "pekerjaan_ibu", name: "Pekerjaan Ibu", desc: "Pekerjaan ibu", type: "text", required: true },
-      { key: "alamat_ibu", name: "Alamat Ibu", desc: "Alamat ibu", type: "text", required: true },
-      { key: "nama_ayah", name: "Nama Ayah", desc: "Nama ayah kandung", type: "text", required: true },
-      { key: "nik_ayah", name: "NIK Ayah", desc: "NIK ayah kandung", type: "number", required: true },
-      { key: "tempat_lahir_ayah", name: "Tempat Lahir Ayah", desc: "Tempat lahir ayah", type: "text", required: true },
-      { key: "tanggal_lahir_ayah", name: "Tanggal Lahir Ayah", desc: "Tanggal lahir ayah", type: "date", required: true },
-      { key: "pekerjaan_ayah", name: "Pekerjaan Ayah", desc: "Pekerjaan ayah", type: "text", required: true },
-      { key: "alamat_ayah", name: "Alamat Ayah", desc: "Alamat ayah", type: "text", required: true },
-      { key: "nama_pelapor", name: "Nama Pelapor", desc: "Nama pelapor", type: "text", required: true },
-      { key: "hubungan_pelapor", name: "Hubungan Pelapor", desc: "Hubungan dengan anak", type: "text", required: true },
-      { key: "alamat_pelapor", name: "Alamat Pelapor", desc: "Alamat pelapor", type: "text", required: true }
+      { key: "anak_ke", name: "Anak Ke-", desc: "Urutan kelahiran", type: "number", required: true, satuan: null },
+      { key: "nik_ibu", name: "NIK Ibu", desc: "NIK ibu kandung", type: "number", required: true, satuan: null },
+      { key: "nama_ibu", name: "Nama Ibu", desc: "Nama ibu kandung", type: "text", required: true, satuan: null },
+      { key: "tempat_lahir_ibu", name: "Tempat Lahir Ibu", desc: "Tempat lahir ibu", type: "text", required: true, satuan: null },
+      { key: "tanggal_lahir_ibu", name: "Tanggal Lahir Ibu", desc: "Tanggal lahir ibu", type: "date", required: true, satuan: null },
+      { key: "pekerjaan_ibu", name: "Pekerjaan Ibu", desc: "Pekerjaan ibu", type: "text", required: true, satuan: null },
+      { key: "alamat_ibu", name: "Alamat Ibu", desc: "Alamat ibu", type: "text", required: true, satuan: null },
+      { key: "nama_ayah", name: "Nama Ayah", desc: "Nama ayah kandung", type: "text", required: true, satuan: null },
+      { key: "nik_ayah", name: "NIK Ayah", desc: "NIK ayah kandung", type: "number", required: true, satuan: null },
+      { key: "tempat_lahir_ayah", name: "Tempat Lahir Ayah", desc: "Tempat lahir ayah", type: "text", required: true, satuan: null },
+      { key: "tanggal_lahir_ayah", name: "Tanggal Lahir Ayah", desc: "Tanggal lahir ayah", type: "date", required: true, satuan: null },
+      { key: "pekerjaan_ayah", name: "Pekerjaan Ayah", desc: "Pekerjaan ayah", type: "text", required: true, satuan: null },
+      { key: "alamat_ayah", name: "Alamat Ayah", desc: "Alamat ayah", type: "text", required: true, satuan: null },
+      { key: "nama_pelapor", name: "Nama Pelapor", desc: "Nama pelapor", type: "text", required: true, satuan: null },
+      { key: "hubungan_pelapor", name: "Hubungan Pelapor", desc: "Hubungan dengan anak", type: "text", required: true, satuan: null },
+      { key: "alamat_pelapor", name: "Alamat Pelapor", desc: "Alamat pelapor", type: "text", required: true, satuan: null }
    ]
  },
  {
    id: "skkelakuanbaik",
    name: "Surat Keterangan Kelakuan Baik (Pengantar SKCK)",
    syaratDokumen: [
-      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true },
-      { key: "ktp_kk", name: "KTP / KK", desc: "Fotokopi KTP atau KK", required: true }
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
+      { key: "ktp_kk", name: "KTP / KK", desc: "Fotokopi KTP atau KK", required: true, satuan: null }
    ],
    dataText: [],
    dataPelengkap: [
-      { key: "nik", name: "NIK", desc: "Nomor Induk Kependudukan", type: "number", required: true },
-      { key: "nama", name: "Nama Lengkap", desc: "Nama sesuai KTP", type: "text", required: true },
-      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true },
-      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true },
+      { key: "nik", name: "NIK", desc: "Nomor Induk Kependudukan", type: "number", required: true, satuan: null },
+      { key: "nama", name: "Nama Lengkap", desc: "Nama sesuai KTP", type: "text", required: true, satuan: null },
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true, satuan: null },
+      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true, satuan: null },
      {
        key: "jenis_kelamin",
        name: "Jenis Kelamin",
        desc: "Jenis kelamin",
        type: "enum",
        options: enumJenisKelamin,
-        required: true
+        required: true, satuan: null
      },
      {
        key: "agama",
@@ -177,152 +177,152 @@ export const categoryPelayananSurat = [
        desc: "Agama",
        type: "enum",
        options: enumAgama,
-        required: true
+        required: true, satuan: null
      },
-      { key: "alamat", name: "Alamat", desc: "Alamat tempat tinggal", type: "text", required: true },
-      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan", type: "text", required: true },
-      { key: "polsek", name: "Polsek Tujuan", desc: "Polsek tujuan", type: "text", required: true }
+      { key: "alamat", name: "Alamat", desc: "Alamat tempat tinggal", type: "text", required: true, satuan: null },
+      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan", type: "text", required: true, satuan: null },
+      { key: "polsek", name: "Polsek Tujuan", desc: "Polsek tujuan", type: "text", required: true, satuan: null }
    ]
  },
  {
    id: "skkematian",
    name: "Surat Keterangan Kematian",
    syaratDokumen: [
-      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true },
-      { key: "ktp_kk", name: "KTP / KK", desc: "Fotokopi KTP atau KK", required: true },
-      { key: "surat_kematian", name: "Surat Keterangan Kematian", desc: "Surat keterangan kematian dari rumah sakit/dokter (jika ada)", required: false }
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
+      { key: "ktp_kk", name: "KTP / KK", desc: "Fotokopi KTP atau KK", required: true, satuan: null },
+      { key: "surat_kematian", name: "Surat Keterangan Kematian", desc: "Surat keterangan kematian dari rumah sakit/dokter (jika ada)", required: false, satuan: null }
    ],
    dataText: [],
    dataPelengkap: [
-      { key: "nik_pelapor", name: "NIK Pelapor", desc: "NIK pelapor", type: "number", required: true },
-      { key: "nama_pelapor", name: "Nama Pelapor", desc: "Nama pelapor", type: "text", required: true },
-      { key: "pekerjaan_pelapor", name: "Pekerjaan Pelapor", desc: "Pekerjaan pelapor", type: "text", required: true },
-      { key: "alamat_pelapor", name: "Alamat Pelapor", desc: "Alamat pelapor", type: "text", required: true },
-      { key: "hubungan_pelapor", name: "Hubungan Pelapor", desc: "Hubungan dengan almarhum", type: "text", required: true },
-      { key: "nama_almarhum", name: "Nama Almarhum", desc: "Nama almarhum", type: "text", required: true },
-      { key: "nik_almarhum", name: "NIK Almarhum", desc: "NIK almarhum", type: "number", required: true },
-      { key: "tempat_lahir_almarhum", name: "Tempat Lahir", desc: "Tempat lahir almarhum", type: "text", required: true },
-      { key: "tanggal_lahir_almarhum", name: "Tanggal Lahir", desc: "Tanggal lahir almarhum", type: "date", required: true },
-      { key: "alamat_almarhum", name: "Alamat", desc: "Alamat terakhir", type: "text", required: true },
+      { key: "nik_pelapor", name: "NIK Pelapor", desc: "NIK pelapor", type: "number", required: true, satuan: null },
+      { key: "nama_pelapor", name: "Nama Pelapor", desc: "Nama pelapor", type: "text", required: true, satuan: null },
+      { key: "pekerjaan_pelapor", name: "Pekerjaan Pelapor", desc: "Pekerjaan pelapor", type: "text", required: true, satuan: null },
+      { key: "alamat_pelapor", name: "Alamat Pelapor", desc: "Alamat pelapor", type: "text", required: true, satuan: null },
+      { key: "hubungan_pelapor", name: "Hubungan Pelapor", desc: "Hubungan dengan almarhum", type: "text", required: true, satuan: null },
+      { key: "nama_almarhum", name: "Nama Almarhum", desc: "Nama almarhum", type: "text", required: true, satuan: null },
+      { key: "nik_almarhum", name: "NIK Almarhum", desc: "NIK almarhum", type: "number", required: true, satuan: null },
+      { key: "tempat_lahir_almarhum", name: "Tempat Lahir", desc: "Tempat lahir almarhum", type: "text", required: true, satuan: null },
+      { key: "tanggal_lahir_almarhum", name: "Tanggal Lahir", desc: "Tanggal lahir almarhum", type: "date", required: true, satuan: null },
+      { key: "alamat_almarhum", name: "Alamat", desc: "Alamat terakhir", type: "text", required: true, satuan: null },
      {
        key: "agama_almarhum",
        name: "Agama Almarhum",
        desc: "Agama almarhum",
        type: "enum",
        options: enumAgama,
-        required: true
+        required: true, satuan: null
      },
-      { key: "tanggal_kematian", name: "Tanggal Kematian", desc: "Tanggal meninggal dunia", type: "date", required: true },
-      { key: "waktu_kematian", name: "Waktu Kematian", desc: "Waktu meninggal dunia", type: "text", required: true },
-      { key: "tempat_kematian", name: "Tempat Kematian", desc: "Tempat meninggal dunia", type: "text", required: true },
-      { key: "penyebab_kematian", name: "Penyebab Kematian", desc: "Penyebab meninggal dunia", type: "text", required: true }
+      { key: "tanggal_kematian", name: "Tanggal Kematian", desc: "Tanggal meninggal dunia", type: "date", required: true, satuan: null },
+      { key: "waktu_kematian", name: "Waktu Kematian", desc: "Waktu meninggal dunia", type: "text", required: true, satuan: null },
+      { key: "tempat_kematian", name: "Tempat Kematian", desc: "Tempat meninggal dunia", type: "text", required: true, satuan: null },
+      { key: "penyebab_kematian", name: "Penyebab Kematian", desc: "Penyebab meninggal dunia", type: "text", required: true, satuan: null }
    ]
  },
  {
    id: "skpenghasilan",
    name: "Surat Keterangan Penghasilan",
    syaratDokumen: [
-      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true },
-      { key: "ktp_ortu_kk", name: "KTP Orang Tua / KK", desc: "Fotokopi KTP orang tua/KK", required: true },
-      { key: "surat_pernyataan", name: "Surat Pernyataan Penghasilan", desc: "Surat pernyataan penghasilan bermaterai", required: true }
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
+      { key: "ktp_ortu_kk", name: "KTP Orang Tua / KK", desc: "Fotokopi KTP orang tua/KK", required: true, satuan: null },
+      { key: "surat_pernyataan", name: "Surat Pernyataan Penghasilan", desc: "Surat pernyataan penghasilan bermaterai", required: true, satuan: null }
    ],
    dataText: [],
    dataPelengkap: [
-      { key: "nama", name: "Nama Lengkap", desc: "Nama pemohon", type: "text", required: true },
-      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true },
-      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true },
+      { key: "nama", name: "Nama Lengkap", desc: "Nama pemohon", type: "text", required: true, satuan: null },
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true, satuan: null },
+      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true, satuan: null },
      {
        key: "jenis_kelamin",
        name: "Jenis Kelamin",
        desc: "Jenis kelamin",
        type: "enum",
        options: enumJenisKelamin,
-        required: true
+        required: true, satuan: null
      },
-      { key: "alamat", name: "Alamat", desc: "Alamat tempat tinggal", type: "text", required: true },
-      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan pemohon", type: "text", required: true },
-      { key: "penghasilan", name: "Penghasilan", desc: "Jumlah penghasilan per bulan", type: "number", required: true },
-      { key: "alasan", name: "Alasan Permohonan", desc: "Alasan pengajuan surat penghasilan", type: "text", required: true }
+      { key: "alamat", name: "Alamat", desc: "Alamat tempat tinggal", type: "text", required: true, satuan: null },
+      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan pemohon", type: "text", required: true, satuan: null },
+      { key: "penghasilan", name: "Penghasilan", desc: "Jumlah penghasilan per bulan", type: "number", required: true, satuan: "/Bulan" },
+      { key: "alasan", name: "Alasan Permohonan", desc: "Alasan pengajuan surat penghasilan", type: "text", required: true, satuan: null }
    ]
  },
  {
    id: "sktempatusaha",
    name: "Surat Keterangan Tempat Usaha",
    syaratDokumen: [
-      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true },
-      { key: "ktp_kk", name: "KTP / KK", desc: "Fotokopi KTP/KK", required: true },
-      { key: "foto_lokasi", name: "Foto Lokasi Usaha", desc: "Foto lokasi usaha", required: true },
-      { key: "dokumen_lahan", name: "Dokumen Lahan", desc: "SPPT/Sertifikat/surat sewa tempat usaha", required: true }
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
+      { key: "ktp_kk", name: "KTP / KK", desc: "Fotokopi KTP/KK", required: true, satuan: null },
+      { key: "foto_lokasi", name: "Foto Lokasi Usaha", desc: "Foto lokasi usaha", required: true, satuan: null },
+      { key: "dokumen_lahan", name: "Dokumen Lahan", desc: "SPPT/Sertifikat/surat sewa tempat usaha", required: true, satuan: null }
    ],
    dataText: [],
    dataPelengkap: [
-      { key: "nik", name: "NIK", desc: "NIK pemilik", type: "number", required: true },
-      { key: "nama_pemilik", name: "Nama Pemilik", desc: "Nama pemilik usaha", type: "text", required: true },
-      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true },
-      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true },
-      { key: "alamat_pemilik", name: "Alamat Pemilik", desc: "Alamat pemilik", type: "text", required: true },
-      { key: "nama_usaha", name: "Nama Usaha", desc: "Nama usaha", type: "text", required: true },
-      { key: "bidang_usaha", name: "Bidang Usaha", desc: "Bidang usaha", type: "text", required: true },
-      { key: "alamat_usaha", name: "Alamat Usaha", desc: "Alamat usaha", type: "text", required: true },
+      { key: "nik", name: "NIK", desc: "NIK pemilik", type: "number", required: true, satuan: null },
+      { key: "nama_pemilik", name: "Nama Pemilik", desc: "Nama pemilik usaha", type: "text", required: true, satuan: null },
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true, satuan: null },
+      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true, satuan: null },
+      { key: "alamat_pemilik", name: "Alamat Pemilik", desc: "Alamat pemilik", type: "text", required: true, satuan: null },
+      { key: "nama_usaha", name: "Nama Usaha", desc: "Nama usaha", type: "text", required: true, satuan: null },
+      { key: "bidang_usaha", name: "Bidang Usaha", desc: "Bidang usaha", type: "text", required: true, satuan: null },
+      { key: "alamat_usaha", name: "Alamat Usaha", desc: "Alamat usaha", type: "text", required: true, satuan: null },
      {
        key: "status_tempat",
        name: "Status Tempat Usaha",
        desc: "Status kepemilikan tempat usaha",
        type: "enum",
        options: enumStatusTempatUsaha,
-        required: true
+        required: true, satuan: null
      },
-      { key: "luas_usaha", name: "Luas Tempat Usaha", desc: "Luas tempat usaha (m²)", type: "number", required: true },
-      { key: "jumlah_karyawan", name: "Jumlah Karyawan", desc: "Jumlah karyawan", type: "number", required: true },
-      { key: "tujuan", name: "Tujuan Pembuatan Surat", desc: "Tujuan pembuatan surat keterangan", type: "text", required: true }
+      { key: "luas_usaha", name: "Luas Tempat Usaha", desc: "Luas tempat usaha (m²)", type: "number", required: true, satuan: "m²" },
+      { key: "jumlah_karyawan", name: "Jumlah Karyawan", desc: "Jumlah karyawan", type: "number", required: true, satuan: null },
+      { key: "tujuan", name: "Tujuan Pembuatan Surat", desc: "Tujuan pembuatan surat keterangan", type: "text", required: true, satuan: null }
    ]
  },
  {
    id: "sktidakmampu",
    name: "Surat Keterangan Tidak Mampu",
    syaratDokumen: [
-      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true },
-      { key: "ktp_kia_kk", name: "KTP / KIA / KK", desc: "Fotokopi KTP/KIA/KK", required: true }
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
+      { key: "ktp_kia_kk", name: "KTP / KIA / KK", desc: "Fotokopi KTP/KIA/KK", required: true, satuan: null }
    ],
    dataText: [],
    dataPelengkap: [
-      { key: "nik", name: "NIK", desc: "NIK pemohon", type: "number", required: true },
-      { key: "nama Lengkap", name: "Nama", desc: "Nama pemohon", type: "text", required: true },
-      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true },
-      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true },
-      { key: "alamat", name: "Alamat", desc: "Alamat pemohon", type: "text", required: true },
-      { key: "alasan", name: "Alasan Permohonan", desc: "Alasan permohonan", type: "text", required: true }
+      { key: "nik", name: "NIK", desc: "NIK pemohon", type: "number", required: true, satuan: null },
+      { key: "nama Lengkap", name: "Nama", desc: "Nama pemohon", type: "text", required: true, satuan: null },
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true, satuan: null },
+      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true, satuan: null },
+      { key: "alamat", name: "Alamat", desc: "Alamat pemohon", type: "text", required: true, satuan: null },
+      { key: "alasan", name: "Alasan Permohonan", desc: "Alasan permohonan", type: "text", required: true, satuan: null }
    ]
  },
  {
    id: "skusaha",
    name: "Surat Keterangan Usaha",
    syaratDokumen: [
-      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true },
-      { key: "ktp_kk", name: "KTP / KK", desc: "Fotokopi KTP/KK", required: true },
-      { key: "foto_lokasi", name: "Foto Lokasi Usaha", desc: "Foto lokasi usaha", required: true }
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
+      { key: "ktp_kk", name: "KTP / KK", desc: "Fotokopi KTP/KK", required: true, satuan: null },
+      { key: "foto_lokasi", name: "Foto Lokasi Usaha", desc: "Foto lokasi usaha", required: true, satuan: null }
    ],
    dataText: [],
    dataPelengkap: [
-      { key: "nama", name: "Nama Lengkap", desc: "Nama pemilik usaha", type: "text", required: true },
+      { key: "nama", name: "Nama Lengkap", desc: "Nama pemilik usaha", type: "text", required: true, satuan: null },
      {
        key: "jenis_kelamin",
        name: "Jenis Kelamin",
        desc: "Jenis kelamin pemilik usaha",
        type: "enum",
        options: enumJenisKelamin,
-        required: true
+        required: true, satuan: null
      },
-      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true },
-      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true },
-      { key: "negara", name: "Kewarganegaraan", desc: "Kewarganegaraan", type: "text", required: true },
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true, satuan: null },
+      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true, satuan: null },
+      { key: "negara", name: "Kewarganegaraan", desc: "Kewarganegaraan", type: "text", required: true, satuan: null },
      {
        key: "agama",
        name: "Agama",
        desc: "Agama",
        type: "enum",
        options: enumAgama,
-        required: true
+        required: true, satuan: null
      },
      {
        key: "status_perkawinan",
@@ -330,54 +330,54 @@ export const categoryPelayananSurat = [
        desc: "Status perkawinan",
        type: "enum",
        options: enumStatusPerkawinan,
-        required: true
+        required: true, satuan: null
      },
-      { key: "alamat", name: "Alamat", desc: "Alamat", type: "text", required: true },
-      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan", type: "text", required: true },
-      { key: "jenis_usaha", name: "Jenis Usaha", desc: "Jenis usaha", type: "text", required: true },
-      { key: "alamat_usaha", name: "Alamat Usaha", desc: "Alamat usaha", type: "text", required: true }
+      { key: "alamat", name: "Alamat", desc: "Alamat", type: "text", required: true, satuan: null },
+      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan", type: "text", required: true, satuan: null },
+      { key: "jenis_usaha", name: "Jenis Usaha", desc: "Jenis usaha", type: "text", required: true, satuan: null },
+      { key: "alamat_usaha", name: "Alamat Usaha", desc: "Alamat usaha", type: "text", required: true, satuan: null }
    ]
  },
  {
    id: "skyatimpiatu",
    name: "Surat Keterangan Yatim / Piatu / Yatim Piatu",
    syaratDokumen: [
-      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true },
-      { key: "ktp_kia_kk", name: "KTP / KIA / KK", desc: "Fotokopi KTP/KIA/KK", required: true }
+      { key: "pengantar_kelian", name: "Pengantar Kelian", desc: "Surat Pengantar Kelian Banjar Dinas", required: true, satuan: null },
+      { key: "ktp_kia_kk", name: "KTP / KIA / KK", desc: "Fotokopi KTP/KIA/KK", required: true, satuan: null }
    ],
    dataText: [],
    dataPelengkap: [
-      { key: "nik", name: "NIK", desc: "NIK anak", type: "number", required: true },
-      { key: "nama", name: "Nama", desc: "Nama anak", type: "text", required: true },
-      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true },
-      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true },
+      { key: "nik", name: "NIK", desc: "NIK anak", type: "number", required: true, satuan: null },
+      { key: "nama", name: "Nama", desc: "Nama anak", type: "text", required: true, satuan: null },
+      { key: "tempat_lahir", name: "Tempat Lahir", desc: "Tempat lahir", type: "text", required: true, satuan: null },
+      { key: "tanggal_lahir", name: "Tanggal Lahir", desc: "Tanggal lahir", type: "date", required: true, satuan: null },
      {
        key: "jenis_kelamin",
        name: "Jenis Kelamin",
        desc: "Jenis kelamin anak",
        type: "enum",
        options: enumJenisKelamin,
-        required: true
+        required: true, satuan: null
      },
-      { key: "alamat", name: "Alamat", desc: "Alamat", type: "text", required: true },
-      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan (jika ada)", type: "text", required: false },
-      { key: "nama_ayah", name: "Nama Ayah", desc: "Nama ayah", type: "text", required: true },
+      { key: "alamat", name: "Alamat", desc: "Alamat", type: "text", required: true, satuan: null },
+      { key: "pekerjaan", name: "Pekerjaan", desc: "Pekerjaan (jika ada)", type: "text", required: false, satuan: null },
+      { key: "nama_ayah", name: "Nama Ayah", desc: "Nama ayah", type: "text", required: true, satuan: null },
      {
        key: "status_ayah",
        name: "Status Ayah",
        desc: "Status ayah",
        type: "enum",
        options: enumStatusHidup,
-        required: true
+        required: true, satuan: null
      },
-      { key: "nama_ibu", name: "Nama Ibu", desc: "Nama ibu", type: "text", required: true },
+      { key: "nama_ibu", name: "Nama Ibu", desc: "Nama ibu", type: "text", required: true, satuan: null },
      {
        key: "status_ibu",
        name: "Status Ibu",
        desc: "Status ibu",
        type: "enum",
        options: enumStatusHidup,
-        required: true
+        required: true, satuan: null
      }
    ]
  }
--- a/src/pages/darmasaba/surat.tsx
+++ b/src/pages/darmasaba/surat.tsx
@@ -31,7 +31,7 @@ import {
  IconInfoCircle,
  IconNotes,
  IconPhone,
-  IconUpload,
+  IconUpload
 } from "@tabler/icons-react";
 import dayjs from "dayjs";
 import "dayjs/locale/id";
@@ -527,6 +527,10 @@ export default function FormSurat() {
                                      (n: any) => n.key == item.key,
                                    )?.value
                                  }
+                                  rightSection={
+                                    item.satuan != null &&
+                                    <Text mr={"lg"}>{item.satuan}</Text>
+                                  }
                                />
                              )}
                            </Grid.Col>
--- a/src/pages/darmasaba/update_data_surat.tsx
+++ b/src/pages/darmasaba/update_data_surat.tsx
@@ -781,6 +781,10 @@ function DataUpdate({
                        dataPelengkap.find((n: any) => n.key == item.key)?.value
                      }
                      disabled={status != "ditolak" && status != "antrian"}
+                      rightSection={
+                        item.satuan != null &&
+                        <Text mr={"lg"}>{item.satuan}</Text>
+                      }
                    />
                  )}
                </Grid.Col>
@@ -789,7 +793,7 @@ function DataUpdate({
          </FormSection>

          <FormSection
-            title="Syarat Dokumen"
+            title="Syarat Dokumen hjh"
            description="Syarat dokumen yang diperlukan"
            icon={<IconFiles size={16} />}
          >
--- a/src/pages/scr/dashboard/pelayanan-surat/detail_pelayanan_page.tsx
+++ b/src/pages/scr/dashboard/pelayanan-surat/detail_pelayanan_page.tsx
@@ -123,7 +123,7 @@ function DetailDataPengajuan({
  const [permissions, setPermissions] = useState<JsonValue[]>([]);
  const [viewImg, setViewImg] = useState({ file: "", folder: "" });
  const [uploading, setUploading] = useState({ ok: false, file: "" });
-  const [editValue, setEditValue] = useState({ id: "", jenis: "", val: "", option: null as any, type: "", key: "" })
+  const [editValue, setEditValue] = useState({ id: "", jenis: "", val: "", satuan: null as string | null, option: null as any, type: "", key: "" })
  const [openEdit, setOpenEdit] = useState(false)
  const [loadingUpdate, setLoadingUpdate] = useState(false)
  const [loadingFS, setLoadingFS] = useState({ value: false, text: "" })
@@ -368,6 +368,10 @@ function DetailDataPengajuan({
              type={editValue.type}
              onChange={(e) => { setEditValue({ ...editValue, val: e.target.value }) }}
              value={editValue.val}
+              rightSection={
+                editValue.satuan != null &&
+                <Text mr={"lg"}>{editValue.satuan}</Text>
+              }
            />
          )}
          <Group justify="center" grow>
@@ -575,13 +579,13 @@ function DetailDataPengajuan({
                              direction="row"
                            >
                              <Text>
-                                {_.upperFirst(item.value)}
+                                {_.upperFirst(item.value)} {item.satuan}
                              </Text>
                              <ActionIcon
                                variant="subtle"
                                aria-label="Edit"
                                onClick={() => {
-                                  setEditValue({ id: item.id, val: item.value, type: item.type, option: item.options, jenis: item.jenis, key: item.key })
+                                  setEditValue({ id: item.id, val: item.value, type: item.type, satuan: item.satuan, option: item.options, jenis: item.jenis, key: item.key })
                                  setOpenEdit(true)
                                }}>
                                <IconEdit size={16} />
--- a/src/server/routes/noc_route.ts
+++ b/src/server/routes/noc_route.ts
@@ -0,0 +1,359 @@
+import Elysia from "elysia";
+import { prisma } from "../lib/prisma";
+
+
+const NocRoute = new Elysia({
+   prefix: "noc",
+   tags: ["noc"],
+})
+
+   .get("/surat-perminggu", async () => {
+      const now = new Date();
+      const startOfThisWeek = new Date(now);
+      const day = now.getDay();
+      const diff = (day === 0 ? 6 : day - 1); // Adjust for Monday as start (Sunday=0 becomes 6, Monday=1 becomes 0)
+      startOfThisWeek.setDate(now.getDate() - diff);
+      startOfThisWeek.setHours(0, 0, 0, 0);
+
+      const endOfThisWeek = new Date(startOfThisWeek);
+      endOfThisWeek.setDate(startOfThisWeek.getDate() + 7);
+
+      const startOfLastWeek = new Date(startOfThisWeek);
+      startOfLastWeek.setDate(startOfThisWeek.getDate() - 7);
+
+      const endOfLastWeek = new Date(startOfThisWeek);
+
+      const [thisWeekCount, lastWeekCount] = await Promise.all([
+         prisma.suratPelayanan.count({
+            where: {
+               isActive: true,
+               createdAt: {
+                  gte: startOfThisWeek,
+                  lt: endOfThisWeek,
+               }
+            }
+         }),
+         prisma.suratPelayanan.count({
+            where: {
+               isActive: true,
+               createdAt: {
+                  gte: startOfLastWeek,
+                  lt: endOfLastWeek,
+               }
+            }
+         })
+      ]);
+
+      let percentageIncrease = 0;
+      if (lastWeekCount > 0) {
+         percentageIncrease = ((thisWeekCount - lastWeekCount) / lastWeekCount) * 100;
+      } else if (thisWeekCount > 0) {
+         percentageIncrease = 100;
+      }
+
+      return {
+         jumlah: thisWeekCount, // jumlah surat minggu ini
+         persentase_kenaikan: Number(percentageIncrease.toFixed(2)) // persentase kenaikan dari minggu lalu
+      };
+
+   }, {
+      detail: {
+         summary: "Jumlah surat minggu ini dan kenaikan dari minggu lalu",
+         description: `tool untuk mendapatkan jumlah surat minggu ini dan persentase kenaikan dibandingkan minggu lalu`,
+      }
+   })
+
+   .get("/pengaduan-count", async () => {
+      const [antrian, diterima, dikerjakan, ditolak, selesai] = await Promise.all([
+         prisma.pengaduan.count({
+            where: {
+               isActive: true,
+               status: "antrian",
+            }
+         }),
+         prisma.pengaduan.count({
+            where: {
+               isActive: true,
+               status: "dikerjakan",
+            }
+         }),
+         prisma.pengaduan.count({
+            where: {
+               isActive: true,
+               status: "diterima",
+            }
+         }),
+         prisma.pengaduan.count({
+            where: {
+               isActive: true,
+               status: "ditolak",
+            }
+         }),
+         prisma.pengaduan.count({
+            where: {
+               isActive: true,
+               status: "selesai",
+            }
+         })
+      ]);
+
+      return {
+         antrian,
+         diterima,
+         dikerjakan,
+         ditolak,
+         selesai,
+         aktif: antrian + diterima + dikerjakan,
+         total: antrian + diterima + dikerjakan + ditolak + selesai
+      };
+   }, {
+      detail: {
+         summary: "Jumlah pengaduan antrian, diterima, dikerjakan, ditolak dan selesai",
+         description: "Menghitung jumlah pengaduan yang sedang aktif (antrian, diterima, dikerjakan), dan total (termasuk ditolak dan selesai)",
+      }
+   })
+
+   .get("/pelayanan-count", async () => {
+      const now = new Date();
+
+      // Bulan ini
+      const startOfThisMonth = new Date(now.getFullYear(), now.getMonth(), 1);
+      const endOfThisMonth = new Date(now.getFullYear(), now.getMonth() + 1, 1);
+
+      // Bulan lalu
+      const startOfLastMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1);
+      const endOfLastMonth = new Date(now.getFullYear(), now.getMonth(), 1);
+
+      const [thisMonthCount, lastMonthCount] = await Promise.all([
+         prisma.pelayananAjuan.count({
+            where: {
+               isActive: true,
+               status: "selesai",
+               createdAt: {
+                  gte: startOfThisMonth,
+                  lt: endOfThisMonth,
+               }
+            }
+         }),
+         prisma.pelayananAjuan.count({
+            where: {
+               isActive: true,
+               status: "selesai",
+               createdAt: {
+                  gte: startOfLastMonth,
+                  lt: endOfLastMonth,
+               }
+            }
+         })
+      ]);
+
+      let percentageIncrease = 0;
+      if (lastMonthCount > 0) {
+         percentageIncrease = ((thisMonthCount - lastMonthCount) / lastMonthCount) * 100;
+      } else if (thisMonthCount > 0) {
+         percentageIncrease = 100;
+      }
+
+      return {
+         total_bulan_ini: thisMonthCount,
+         persentase_kenaikan: Number(percentageIncrease.toFixed(2))
+      };
+   }, {
+      detail: {
+         summary: "Total pelayanan selesai bulan ini dan kenaikan dari bulan lalu",
+         description: "Menampilkan total pelayanan yang telah berstatus selesai bulan ini dan persentase kenaikan dari bulan lalu",
+      }
+   })
+
+   .get("/pengajuan-history", async ({ query }) => {
+      const { period = "6months" } = query as { period?: string };
+      const now = new Date();
+      const results: { label: string; total: number }[] = [];
+
+      if (period === "4weeks") {
+         // Get the most recent Monday
+         const currentDay = now.getDay();
+         const diffToMonday = (currentDay === 0 ? 6 : currentDay - 1);
+         const startOfCurrentWeek = new Date(now);
+         startOfCurrentWeek.setDate(now.getDate() - diffToMonday);
+         startOfCurrentWeek.setHours(0, 0, 0, 0);
+
+         for (let i = 3; i >= 0; i--) {
+            const startOfWeek = new Date(startOfCurrentWeek);
+            startOfWeek.setDate(startOfCurrentWeek.getDate() - (i * 7));
+
+            const endOfWeek = new Date(startOfWeek);
+            endOfWeek.setDate(startOfWeek.getDate() + 7);
+
+            const count = await prisma.pelayananAjuan.count({
+               where: {
+                  isActive: true,
+                  createdAt: {
+                     gte: startOfWeek,
+                     lt: endOfWeek,
+                  }
+               }
+            });
+
+            const label = `Minggu ${4 - i}`;
+            results.push({ label, total: count });
+         }
+      } else {
+         // Default 6 months
+         for (let i = 5; i >= 0; i--) {
+            const startOfMonth = new Date(now.getFullYear(), now.getMonth() - i, 1);
+            const endOfMonth = new Date(now.getFullYear(), now.getMonth() - i + 1, 1);
+
+            const count = await prisma.pelayananAjuan.count({
+               where: {
+                  isActive: true,
+                  createdAt: {
+                     gte: startOfMonth,
+                     lt: endOfMonth,
+                  }
+               }
+            });
+
+            const monthName = startOfMonth.toLocaleString('id-ID', { month: 'long' });
+            results.push({ label: monthName, total: count });
+         }
+      }
+
+      return results;
+   }, {
+      detail: {
+         summary: "Total pengajuan surat 6 bulan / 4 minggu",
+         description: "Menampilkan total pengajuan surat selama 6 bulan terakhir atau 4 minggu terakhir",
+      }
+   })
+
+   .get("/pengaduan-history", async ({ query }) => {
+      const { period = "6months" } = query as { period?: string };
+      const now = new Date();
+      const results: { label: string; total: number }[] = [];
+
+      if (period === "7days") {
+         for (let i = 6; i >= 0; i--) {
+            const startOfDay = new Date(now);
+            startOfDay.setDate(now.getDate() - i);
+            startOfDay.setHours(0, 0, 0, 0);
+
+            const endOfDay = new Date(startOfDay);
+            endOfDay.setDate(startOfDay.getDate() + 1);
+
+            const count = await prisma.pengaduan.count({
+               where: {
+                  isActive: true,
+                  createdAt: {
+                     gte: startOfDay,
+                     lt: endOfDay,
+                  }
+               }
+            });
+
+            const label = startOfDay.toLocaleDateString('id-ID', { weekday: 'long' });
+            results.push({ label, total: count });
+         }
+      } else {
+         // Default 6 months
+         for (let i = 5; i >= 0; i--) {
+            const startOfMonth = new Date(now.getFullYear(), now.getMonth() - i, 1);
+            const endOfMonth = new Date(now.getFullYear(), now.getMonth() - i + 1, 1);
+
+            const count = await prisma.pengaduan.count({
+               where: {
+                  isActive: true,
+                  createdAt: {
+                     gte: startOfMonth,
+                     lt: endOfMonth,
+                  }
+               }
+            });
+
+            const monthName = startOfMonth.toLocaleString('id-ID', { month: 'long' });
+            results.push({ label: monthName, total: count });
+         }
+      }
+
+      return results;
+   }, {
+      detail: {
+         summary: "Total pengaduan 6 bulan / 7 hari",
+         description: "Menampilkan total pengaduan selama 6 bulan terakhir atau 7 hari terakhir",
+      }
+   })
+
+   .get("/pelayanan-perjenis", async () => {
+      const categories = await prisma.categoryPelayanan.findMany({
+         where: {
+            isActive: true
+         },
+         select: {
+            name: true,
+            _count: {
+               select: {
+                  SuratPelayanan: {
+                     where: {
+                        isActive: true
+                     }
+                  }
+               }
+            }
+         }
+      });
+
+      return categories
+         .map(cat => ({
+            jenis: cat.name,
+            jumlah: cat._count.SuratPelayanan
+         }))
+         .sort((a, b) => b.jumlah - a.jumlah);
+   }, {
+      detail: {
+         summary: "Jumlah surat berdasarkan jenis",
+         description: "Menampilkan jumlah surat berdasarkan jenis/kategori pelayanan",
+      }
+   })
+
+   .get("/pengajuan-terbaru", async () => {
+      const applications = await prisma.pelayananAjuan.findMany({
+         where: {
+            isActive: true
+         },
+         take: 5,
+         orderBy: {
+            createdAt: "desc"
+         },
+         include: {
+            Warga: true,
+            CategoryPelayanan: true
+         }
+      });
+
+      const formatDuration = (date: Date) => {
+         const diff = Math.floor((new Date().getTime() - date.getTime()) / 1000);
+         if (diff < 60) return `${diff} detik yang lalu`;
+         if (diff < 3600) return `${Math.floor(diff / 60)} menit yang lalu`;
+         if (diff < 86400) return `${Math.floor(diff / 3600)} jam yang lalu`;
+         if (diff < 604800) return `${Math.floor(diff / 86400)} hari yang lalu`;
+         return date.toLocaleDateString("id-ID", {
+            day: "numeric",
+            month: "long",
+            year: "numeric"
+         });
+      };
+
+      return applications.map(app => ({
+         jenis: app.CategoryPelayanan.name,
+         status: app.status,
+         namaWarga: app.Warga.name,
+         durasi: formatDuration(app.createdAt)
+      }));
+   }, {
+      detail: {
+         summary: "5 data pengajuan surat terbaru",
+         description: "Menampilkan 5 data pengajuan surat terbaru beserta status, nama warga, dan durasi pengajuan",
+      }
+   })
+
+export default NocRoute
--- a/src/server/routes/pelayanan_surat_route.ts
+++ b/src/server/routes/pelayanan_surat_route.ts
@@ -315,6 +315,7 @@ const PelayananRoute = new Elysia({
         }[]; name: string;
         desc: string;
         key: string;
+         satuan?: string;
      }[];

      const refMap = new Map(
@@ -336,6 +337,7 @@ const PelayananRoute = new Elysia({
               type: ref?.type ?? "",
               options: ref?.options ?? [],
               order: ref?.order ?? Infinity,
+               satuan: ref?.satuan ?? null
            };
         })
         .sort((a, b) => a.order - b.order)
@@ -712,6 +714,7 @@ const PelayananRoute = new Elysia({
         desc: string;
         key: string;
         required: boolean;
+         satuan?: string;
      }[];

      const refMap = new Map(
@@ -734,7 +737,8 @@ const PelayananRoute = new Elysia({
               type: ref?.type ?? "",
               options: ref?.options ?? [],
               order: ref?.order ?? Infinity,
-               required: ref?.required ?? true
+               required: ref?.required ?? true,
+               satuan: ref?.satuan ?? null
            };
         })
         .sort((a, b) => a.order - b.order)
Author	SHA1	Message	Date
amal	0c8b9d1667	upd: api noc	2026-03-17 15:38:44 +08:00
amaliadwiy	a8aa0f8d63	Merge pull request 'upd : api noc dashboard' (#116 ) from amalia/16-mar-26 into main Reviewed-on: #116	2026-03-16 16:13:12 +08:00
amal	39cb8d8391	upd : api noc dashboard	2026-03-16 16:06:08 +08:00
amaliadwiy	d6abc163fb	Merge pull request 'upd: tambah satuan' (#115 ) from amalia/06-feb-26 into main Reviewed-on: http://wibugit.wibudev.com/wibu/jenna-mcp/pulls/115	2026-02-06 17:46:25 +08:00
amaliadwiy	9c08980bf1	upd: tambah satuan Deskripsi: - satuan luas tempat usaha - satuan pendapatan perbulan - pada tambah, edit, detail surat No Issues	2026-02-06 14:39:58 +08:00