Browse Source

update report datatable

pull/1/head
wahyu 8 months ago
parent
commit
0367b336b2
  1. 4
      edit-mode/function/reportActivity.js

4
edit-mode/function/reportActivity.js

@ -2,6 +2,7 @@ var rAModal = $('#modal_report_activity > .modal-dialog > .modal-content');
var rAmaterialModal = $('#modal_report_activity_material > .modal-dialog > .modal-content'); var rAmaterialModal = $('#modal_report_activity_material > .modal-dialog > .modal-content');
var assignMaterialId; var assignMaterialId;
var materialName; var materialName;
var materialId;
var idStatus; var idStatus;
function resetFormAddRa() { function resetFormAddRa() {
@ -173,6 +174,7 @@ $(document).ready(function () {
d.idAmi = assignMaterialId; d.idAmi = assignMaterialId;
d.idAct = activityId; d.idAct = activityId;
d.materialName = materialName; d.materialName = materialName;
d.materialId = materialId;
d.type = 'actual'; d.type = 'actual';
}, },
"error": function (xhr, error, code) { "error": function (xhr, error, code) {
@ -587,6 +589,7 @@ $(document).ready(function () {
$("#table_report").on("click", ".btn-lihat-actual", function () { $("#table_report").on("click", ".btn-lihat-actual", function () {
assignMaterialId = $(this).data('id'); assignMaterialId = $(this).data('id');
materialName = $(this).data('material-name'); materialName = $(this).data('material-name');
materialId = $(this).data('material-id');
var attributeString = this.outerHTML; var attributeString = this.outerHTML;
if (attributeString.includes('"=""')) { if (attributeString.includes('"=""')) {
@ -623,6 +626,7 @@ $(document).ready(function () {
$("#table_report").on("click", ".btn-lihat-plan", function () { $("#table_report").on("click", ".btn-lihat-plan", function () {
assignMaterialId = $(this).data('id'); assignMaterialId = $(this).data('id');
materialName = $(this).data('material-name'); materialName = $(this).data('material-name');
materialId = $(this).data('material-id');
var attributeString = this.outerHTML; var attributeString = this.outerHTML;
if (attributeString.includes('"=""')) { if (attributeString.includes('"=""')) {
materialName = materialName + '"'; materialName = materialName + '"';

Loading…
Cancel
Save