Browse Source

bug fix activity name on actual report modal

pull/1/head
Yusuf 2 years ago
parent
commit
8f2372db5d
  1. 3
      src/function/ganttConfig.js
  2. 2
      src/function/ganttEvent.js
  3. 2
      src/function/reportActivity.js

3
src/function/ganttConfig.js

@ -296,7 +296,6 @@ var allColumns = [
if(text.type=="project" || text.type=="milestone"){
return;
}
activityName = text.kode_sortname || text.text;
let html = ``;
var assign_material = text.assign_material
@ -355,8 +354,6 @@ var allColumns = [
if(text.type=="project" || text.type=="milestone"){
return;
}
activityName = text.kode_sortname || text.text;
$("#report_activity_title").html(`Report Activity ${activityName}`)
let html = text.jobs_done ? text.jobs_done : 0;
return `<div class="d-flex justify-content-center align-items-center" data-toggle="modal" data-target="#modal_report_activity" style="min-width:100%;height:100%;">
${html}

2
src/function/ganttEvent.js

@ -12,6 +12,8 @@ gantt.attachEvent("onAfterTaskAdd", function(id,item){
gantt.attachEvent("onTaskRowClick", function(id,row){
activityId = id;
var activity = gantt.getTaskBy("id", id);
activityName = activity[0].name;
});
gantt.ext.inlineEditors.attachEvent("onBeforeEditStart", function(state){

2
src/function/reportActivity.js

@ -266,8 +266,8 @@ $(document).ready(function () {
});
$('#modal_report_activity').on('show.bs.modal', function (event) {
$("#report_activity_title").html(`Report Activity ${activityName}`)
tableRa.draw();
console.log("oke");
});
$('#modal_report_activity_material').on('show.bs.modal', function (event) {

Loading…
Cancel
Save