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

Compare commits

base: ordo:master
Branches Tags
ordo:Dev-Fuad
ordo:dev-wahyun
ordo:master
..
compare: ordo:dev-wahyun
Branches Tags
ordo:Dev-Fuad
ordo:dev-wahyun
ordo:master

No commits in common. 'master' and 'dev-wahyun' have entirely different histories.
master ... dev-wahyun

2 changed files with 11 additions and 17 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
  1. 8
      edit-mode/function/reportActivity.js
  2. 20
      edit-mode/index.html

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

@ -546,13 +546,7 @@ $(document).ready(function () {
return false;
}
if (data && data.image) {
$format = data.image.split('.').pop();
console.log($format);
if ($format == 'pdf') {
$("#report-pdf").html(`<embed src="${base_url_image}image/${data.image}" type="application/pdf" frameBorder="0" scrolling="auto" height="100%" width="100%" ></embed>`);
} else {
$("#report-image").html(`<img src="${base_url_image}image/${data.image}" class="img-responsive" style="height: 75vh;" />`);
}
$("#report-image").html(`<img src="${base_url_image}${moment(data.created_at).format('YYYY-MM')}/image/${data.image}" class="img-responsive" style="height: 75vh;" />`);
$('#modal-report-image').modal('show');
}
// kalo gambarnya banyak belum di handle...

20
edit-mode/index.html
Unescape View File

@ -645,16 +645,16 @@
<div class="modal fade" id="modal_report_activity" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header d-flex justify-content-start" style="width: 100%;">
<button type="button" class="btn btn-sm btn-danger mr-2 mt-2" data-dismiss="modal" aria-label="Close"><i
class="fas fa-times fa-lg"></i></button>
<button id="show_form_ra" type="button" class="success btn btn-success btn-sm btn-update-status mr-2 mt-2"
data-toggle="tooltip" title="Input Update Status" data-placement="top" aria-hidden="true"><i class="fa fa-cog"
aria-hidden="true"></i></button>
<div class="modal-header d-flex flex-row justify-content-between" style="width: 100%;">
<div class="d-flex flex-column">
<h5 class="modal-title" id="report_activity_title">Report Activity</h5>
<h6 id="report_activity_sub_title"></h6>
</div>
<div>
<button id="show_form_ra" type="button" class="success btn btn-success btn-sm btn-update-status"
data-toggle="tooltip" title="Input Update Status" data-placement="top" aria-hidden="true"><i
class="fa fa-cog" aria-hidden="true"></i></button>
</div>
</div>
<div class="modal-body">
@ -724,8 +724,8 @@
</div>
</div>
<div class="modal-footer">
<!-- <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal"
aria-label="Close">Close</button> -->
<button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal"
aria-label="Close">Close</button>
</div>
</div>
</div>
@ -867,9 +867,9 @@
<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%;">
<h5 class="modal-title" id="report_activity_location">Report File</h5>
<h5 class="modal-title" id="report_activity_location">Report Image</h5>
</div>
<div class="modal-body" id="report-pdf">
<div class="modal-body">
<div id="report-image"></div>
</div>
<div class="modal-footer">

Write Preview
Loading…
Cancel
Save