Merge pull request 'dev-wahyu' (#76) from dev-wahyu into staging

Reviewed-on: ordo/adw-gantt#76

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