diff --git a/index.html b/index.html index e7347fc..a436ad4 100644 --- a/index.html +++ b/index.html @@ -166,6 +166,9 @@ nav
manage_accounts Manajemen Agen & User
+
+ balance Dokumen Regulasi +
quick_references Laporan
diff --git a/modules/dasbor-level1.html b/modules/dasbor-level1.html index 84648ba..562bff5 100644 --- a/modules/dasbor-level1.html +++ b/modules/dasbor-level1.html @@ -142,9 +142,6 @@ const tomonth = new Date(today.getFullYear(),today.getMonth(),1); const tomonthl = new Date(today.getFullYear(),today.getMonth()+1,0); const firstDay = tomonth.getDay(); - console.log("today", today); - console.log("tomonth", tomonth); - console.log("firstday", firstDay); const lastDate = tomonthl.getDate(); const todayDate = today.getDate() let x = 0; diff --git a/modules/dasbor-level2.html b/modules/dasbor-level2.html index 50d8566..14b823a 100644 --- a/modules/dasbor-level2.html +++ b/modules/dasbor-level2.html @@ -142,9 +142,6 @@ const tomonth = new Date(today.getFullYear(),today.getMonth(),1); const tomonthl = new Date(today.getFullYear(),today.getMonth()+1,0); const firstDay = tomonth.getDay(); - console.log("today", today); - console.log("tomonth", tomonth); - console.log("firstday", firstDay); const lastDate = tomonthl.getDate(); const todayDate = today.getDate() let x = 0; diff --git a/modules/dasbor-level3.html b/modules/dasbor-level3.html index a7d8ee1..44f99a8 100644 --- a/modules/dasbor-level3.html +++ b/modules/dasbor-level3.html @@ -142,9 +142,6 @@ const tomonth = new Date(today.getFullYear(),today.getMonth(),1); const tomonthl = new Date(today.getFullYear(),today.getMonth()+1,0); const firstDay = tomonth.getDay(); - console.log("today", today); - console.log("tomonth", tomonth); - console.log("firstday", firstDay); const lastDate = tomonthl.getDate(); const todayDate = today.getDate() let x = 0; diff --git a/modules/kegiatan-proker-finish.html b/modules/kegiatan-proker-finish.html index 10bea99..16ce8c6 100644 --- a/modules/kegiatan-proker-finish.html +++ b/modules/kegiatan-proker-finish.html @@ -66,6 +66,7 @@ moly.loadScreen.close(loadid); return; } + thisDialog.resolve(true); moly.loadScreen.close(loadid); }); //["prokerid", "notes", "evidence"] diff --git a/modules/kegiatan-proker-new.html b/modules/kegiatan-proker-new.html index 8028b68..dc4094b 100644 --- a/modules/kegiatan-proker-new.html +++ b/modules/kegiatan-proker-new.html @@ -50,6 +50,7 @@ \ No newline at end of file diff --git a/modules/regulasi-view.html b/modules/regulasi-view.html new file mode 100644 index 0000000..056f068 --- /dev/null +++ b/modules/regulasi-view.html @@ -0,0 +1,50 @@ +
+
+
+ Diupload oleh
+ Pada +
+ Nomor/Judul Dokumen:
+
+ Abstrak:
+ + + +
+
+ +
+
+ \ No newline at end of file diff --git a/modules/regulasi.html b/modules/regulasi.html new file mode 100644 index 0000000..4331d59 --- /dev/null +++ b/modules/regulasi.html @@ -0,0 +1,71 @@ +
+ + + + + + + + + + + + + + + + + + + + + + +
Nomor/JudulAbstrakDiupload OlehPada
Data Kosong
+
+Entri Regulasi + \ No newline at end of file diff --git a/modules/submission.html b/modules/submission.html index a13830e..cfb2b25 100644 --- a/modules/submission.html +++ b/modules/submission.html @@ -213,7 +213,7 @@ const deadline = new Date((v.isInMonth ? new Date(v.year, v.startMonth + v.timeTarget, 0) : new Date(v.year, v.startMonth -1, v.startDay + v.timeTarget)).setHours(23,59,59)); const neardeadline = new Date((new Date(deadline)).setDate(deadline.getDate() - 15)).setHours(0,0,0,0); // v.status = v.journal.at(-1).status == 4 && doneline < lifeline ? 4 : v.journal.at(-1).status == 4 && doneline <= deadline ? 5 : v.journal.at(-1).status == 4 && doneline > deadline ? 6 : v.journal.at(-1).status == 3 && v.year < Now.getFullYear() ? 7 : 3; - v.status = v.journal.at(-1).status == 8 ? (v.journal.at(-2).status == 4 && doneline < lifeline ? 4 : v.journal.at(-2).status == 4 && doneline <= deadline ? 5 : v.journal.at(-2).status == 4 && doneline > deadline ? 6 : v.journal.at(-2).status == 3 && v.year < Now.getFullYear() ? 7 : 3) : (v.journal.at(-1).status == 4 && doneline < lifeline ? 4 : v.journal.at(-1).status == 4 && doneline <= deadline ? 5 : v.journal.at(-1).status == 4 && doneline > deadline ? 6 : v.journal.at(-1).status == 3 && v.year < Now.getFullYear() ? 7 : 3); + v.status = v.journal.at(-1).status == 8 ? (v.journal.at(-2).status == 4 && doneline < lifeline ? 4 : v.journal.at(-2).status == 4 && doneline <= deadline ? 5 : v.journal.at(-2).status == 4 && doneline > deadline ? 6 : v.journal.at(-2).status == 3 && v.year < Now.getFullYear() ? 7 : v.journal.at(-2).status) : (v.journal.at(-1).status == 4 && doneline < lifeline ? 4 : v.journal.at(-1).status == 4 && doneline <= deadline ? 5 : v.journal.at(-1).status == 4 && doneline > deadline ? 6 : v.journal.at(-1).status == 3 && v.year < Now.getFullYear() ? 7 : v.journal.at(-1).status); st.append(statusName[v.status]); v.styleCode = v.status != 3 ? v.status : Now < lifeline ? 8 : Now < neardeadline ? 9 : Now >= neardeadline && Now < deadline ? 10 : 11; $(st).text(v.status != 3 ? $(st).text() : Now < lifeline ? "Belum Jadwalnya" : Now < neardeadline ? "Berjalan" : Now >= neardeadline && Now.getDate() == deadline.getDate() && Now.getMonth() == deadline.getMonth() ? "Deadline!" : Now >= neardeadline && Now <= deadline ? "Hampir Deadline" : "Lewat Deadline");