ordo
/
surveyor_indonesia_gantt
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request 'dev-wahyun' (#9) from dev-wahyun into master 

Reviewed-on: ibnu/generic-ospro-gantt#9
pull/1/head
farhantock 5 months ago
parent
e16c1da205 b5c19153d0
commit
ae10184a3d
4 changed files with 11 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      edit-mode/function/reportActivity.js
  2. 3
      edit-mode/index.html
  3. 6
      view-mode/function/reportActivity.js
  4. 1
      view-mode/index.html

6
edit-mode/function/reportActivity.js
Unescape View File

@ -589,7 +589,8 @@ $(document).ready(function () {
if (attributeString.includes('"=""')) {
materialName = materialName + '"';
}
$("#report_activity_material_title").html(`Report Activity Actual ${materialName}`)
$("#report_activity_material_title").html(`Report Activity Actual ${materialName}`);
$('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
$("#modal_report_activity").hide();
$("#form_report_activity_material").show();
@ -624,7 +625,8 @@ $(document).ready(function () {
if (attributeString.includes('"=""')) {
materialName = materialName + '"';
}
$("#report_activity_material_title").html(`Report Activity Plan ${materialName}`)
$("#report_activity_material_title").html(`Report Activity Plan ${materialName}`);
$('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
$("#modal_report_activity").hide();
// $("#show_form_ra_material").hide();
$("#form_report_activity_material").hide();

3
edit-mode/index.html
Unescape View File

@ -736,8 +736,9 @@
<div class="modal-dialog modal-lg" role="document" style="padding-top:5%;">
<!-- <div class="modal-dialog modal-lg" role="document"> -->
<div class="modal-content">
<div class="modal-header d-flex flex-row justify-content-between" style="width: 100%;">
<div class="modal-header d-flex flex-column" style="width: 100%;">
<h5 class="modal-title" id="report_activity_material_title">Report Activity</h5>
<h6 id="report_activity_material_sub_title"></h6>
</div>
<div class="modal-body">
<form class="mb-1 elm-hide" id="form_report_activity_material">

6
view-mode/function/reportActivity.js
Unescape View File

@ -187,7 +187,8 @@ $(document).ready(function () {
assignMaterialId = $(this).data('id');
materialName = $(this).data('material-name');
$("#report_activity_material_title").html(`Report Activity Actual Material ${materialName}`)
$("#report_activity_material_title").html(`Report Activity Actual Material ${materialName}`);
$('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
$("#modal_report_activity").hide();
$("#form_report_activity_material").show();
@ -207,7 +208,8 @@ $(document).ready(function () {
$("#table_report").on("click", ".btn-lihat-plan", function () {
assignMaterialId = $(this).data('id');
materialName = $(this).data('material-name');
$("#report_activity_material_title").html(`Report Activity Plan Material ${materialName}`)
$("#report_activity_material_title").html(`Report Activity Plan Material ${materialName}`);
$('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
$("#modal_report_activity").hide();
$("#activity_material_plan").show();
$("#activity_material_actual").hide();

1
view-mode/index.html
Unescape View File

@ -364,6 +364,7 @@
<div class="modal-content">
<div class="modal-header d-flex flex-row justify-content-between" style="width: 100%;">
<h5 class="modal-title" id="report_activity_material_title">Report Activity Material</h5>
<h6 id="report_activity_material_sub_title"></h6>
</div>
<div class="modal-body">
<div class="table-responsive" id="activity_material_plan">

Write Preview
Loading…
Cancel
Save