diff --git a/modules/dasbor-level1.html b/modules/dasbor-level1.html index 562bff5..0d16b57 100644 --- a/modules/dasbor-level1.html +++ b/modules/dasbor-level1.html @@ -42,7 +42,7 @@
-
+
0
@@ -51,17 +51,16 @@
- -
+
0
- Aksi
+ Sedang
Berlangsung
-
+
0
@@ -80,7 +79,7 @@
-
+
0
@@ -106,6 +105,110 @@
\ No newline at end of file diff --git a/modules/dasbor-level2.html b/modules/dasbor-level2.html index 14b823a..3be2de7 100644 --- a/modules/dasbor-level2.html +++ b/modules/dasbor-level2.html @@ -42,7 +42,7 @@
-
+
0
@@ -51,22 +51,21 @@
- -
+
0
Aksi
- Berlangsung + dalam Draf
-
+
0
- Menunggu
- Respons + Pengajuan
+ Menunggu Respons
@@ -80,11 +79,11 @@
-
+
0
- Telah
+ Pengajuan
Direspons
@@ -106,6 +105,110 @@
\ No newline at end of file diff --git a/modules/dasbor-level3.html b/modules/dasbor-level3.html index 9a8d8a8..01c0951 100644 --- a/modules/dasbor-level3.html +++ b/modules/dasbor-level3.html @@ -59,12 +59,12 @@ Aksi
-
+
0
- Aksi
+ Sedang
Berlangsung
@@ -177,7 +177,7 @@ } return a; },[]); - window.currProkers = prokers.filter(p=>p.year == Now.getFullYear()); + const currProkers = prokers.filter(p=>p.year == Now.getFullYear()); const ongoingProkers = currProkers.filter(p=>p.journal.at(-1).status == 3); const doneProkers = currProkers.filter(p=>p.journal.at(-1).status >= 4); const evaledProkers = currProkers.filter(p=>p.journal.at(-1).status == 8); @@ -197,7 +197,7 @@ const closest = sortedProkers[0]; µ('#udate').text(closest ? `${closest.deadline.getFullYear()}/${(closest.deadline.getMonth()+1).toString().padStart(2,"0")}/${closest.deadline.getDate().toString().padStart(2,"0")}` : ""); µ('#utext').text(closest ? closest.sasaran : ""); - µ('#htoday').empty(); + if(sortedProkers.length>0) µ('#htoday').empty(); $.each(sortedProkers,(_,v)=>{ const d = moly.newElement("div"); const s = moly.newElement("span"); diff --git a/modules/monev.html b/modules/monev.html index 40e5a2b..cebbf40 100644 --- a/modules/monev.html +++ b/modules/monev.html @@ -96,7 +96,7 @@ ] async function populateProker(agentID) { - if(!agentID) return; + if(!agentID) return false; const loadid = moly.loadScreen.show("Memuat Daftar Program Kerja...","bar","#pkWrapper"); prokers = await getJson('/api/getprokers'); if (prokers.status != 200 || prokers.length < 1) @@ -164,6 +164,7 @@ }) fillProker(); moly.loadScreen.close(loadid); + return prokers.length > 0; } function fillProker() { @@ -239,7 +240,7 @@ { const loadid = moly.loadScreen.show("Memuat data agen...","bar","#agWrapper"); $('#agContent').empty(); - $.each(agents,(i,v)=>{ + $.each(agents.filter(a=>a.agentID != userDetails.info.agentID),(i,v)=>{ const ro = moly.newElement("tr"); const no = moly.newElement("td"); const ni = moly.newElement("td"); @@ -252,11 +253,15 @@ ni.append(v.agentID); ni.style.textAlign = "center"; na.append(v.name); - $(ro).click(()=>{ + $(ro).click(async()=>{ + if (!await populateProker(v.agentID)) + { + moly.alert.show("Program Kerja Kosong",`Agen ${v.name} tidak memiliki Program Kerja.`) + return; + } $('#agGroup').prop("collapsed",true); $('#pkGroup').prop("collapsed",false); $('#pkGroup').prop("disabled",false); - populateProker(v.agentID); }); $('#agContent').append(ro); }) diff --git a/modules/submission.html b/modules/submission.html index cfb2b25..750eac1 100644 --- a/modules/submission.html +++ b/modules/submission.html @@ -94,7 +94,7 @@ ] async function populateProker(agentID) { - if(!agentID) return; + if(!agentID) return false; const loadid = moly.loadScreen.show("Memuat Daftar Program Kerja...","bar","#pkWrapper"); prokers = await getJson('/api/getprokers'); if (prokers.status != 200 || prokers.length < 1) @@ -162,6 +162,7 @@ }) fillProker(); moly.loadScreen.close(loadid); + return prokers.length > 0; } function fillProker() { @@ -230,7 +231,7 @@ { const loadid = moly.loadScreen.show("Memuat data agen...","bar","#agWrapper"); $('#agContent').empty(); - $.each(agents,(i,v)=>{ + $.each(agents.filter(a=>a.agentID != userDetails.info.agentID),(i,v)=>{ const ro = moly.newElement("tr"); const no = moly.newElement("td"); const ni = moly.newElement("td"); @@ -243,11 +244,15 @@ ni.append(v.agentID); ni.style.textAlign = "center"; na.append(v.name); - $(ro).click(()=>{ + $(ro).click(async ()=>{ + if (!await populateProker(v.agentID)) + { + moly.alert.show("Program Kerja Kosong",`Agen ${v.name} tidak memiliki Program Kerja.`) + return; + } $('#agGroup').prop("collapsed",true); $('#pkGroup').prop("collapsed",false); $('#pkGroup').prop("disabled",false); - populateProker(v.agentID); }); $('#agContent').append(ro); })