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

Merge pull request 'Dev-Farhan' (#78) from Dev-Farhan into staging 

Reviewed-on: ordo/adw-gantt#78
pull/1/head
farhantock 11 months ago
parent
a9fa44d991 8663a6eff5
commit
7bf56d9052
1 changed files with 71 additions and 52 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. 83
      edit-mode/index.html

83
edit-mode/index.html
Unescape View File

@ -89,7 +89,7 @@
<span class="icon-toolbar-separator">|</span>
<button title="Save" class="btn btn-sm btn-icon-toolbar" id="save-activity"><i
class="fa fa-save icon-toolbar"></i></button>
<span class="icon-toolbar-separator"id="save-separator">|</span>
<span class="icon-toolbar-separator" id="save-separator">|</span>
<button title="Synchronize to Report Activity" class="btn btn-sm btn-icon-toolbar" id="gantt-synchronize"><i
class="fa fa-sync icon-toolbar"></i></button>
<span class="icon-toolbar-separator">|</span>
@ -100,7 +100,7 @@
class="fa fa-grip-lines icon-toolbar"></i></button>
<span class="icon-toolbar-separator">|</span>
<button title="Show / Hide Columns" class="btn btn-sm btn-icon-toolbar" id="gantt_toggle_columns_btn"
onclick="gantt.$showDropdown(this)"><i class="fa fa-columns icon-toolbar"></i></button>
onclick="gantt.$showDropdown(this)"><i class="fa fa-eye-slash icon-toolbar"></i></button>
<span class="icon-toolbar-separator">|</span>
<button title="Gantt Compare" class="btn btn-sm btn-icon-toolbar" id="compare-data"><i
class="fa fa-columns icon-toolbar"></i></button>
@ -140,7 +140,8 @@
<div class="form-row">
<div class="col-md-7 form-group">
<label>Human Resource</label>
<select id="select-hr" name="user_id[]" multiple="multiple" class="form-control form-control-sm" style="width:100%;"></select>
<select id="select-hr" name="user_id[]" multiple="multiple"
class="form-control form-control-sm" style="width:100%;"></select>
</div>
<div class="col-md-2 form-group">
<label>Start Date</label>
@ -210,7 +211,8 @@
<textarea class="form-control" id="comment" name="comment" rows="3"></textarea>
</div>
<div class="text-right">
<button type="button" class="btn btn-sm btn-primary" id="btn_comment_submit">Submit</button>
<button type="button" class="btn btn-sm btn-primary"
id="btn_comment_submit">Submit</button>
</div>
<hr />
</form>
@ -291,8 +293,8 @@
<div class="form-row">
<div class="col-md-2 form-group">
<label>Description</label>
<select id="select-material-integration" name="descriptionReqMaterial" class="form-control form-control-sm"
style="width:100%;"></select>
<select id="select-material-integration" name="descriptionReqMaterial"
class="form-control form-control-sm" style="width:100%;"></select>
</div>
<div class="col-md-2 form-group">
<label>Price (IDR)</label>
@ -306,7 +308,8 @@
</div>
<div class="col-md-1 form-group">
<label>UOM</label>
<select id="uom-req-material" name="uomReqMaterial" class="form-control form-control-sm"></select>
<select id="uom-req-material" name="uomReqMaterial"
class="form-control form-control-sm"></select>
</div>
<div class="col-md-2 form-group">
<label>Expected arrival date</label>
@ -373,7 +376,8 @@
</div>
<div class="col-md-1 form-group">
<label>UOM</label>
<select id="uom-req-expense" name="uomReqexpense" class="form-control form-control-sm"></select>
<select id="uom-req-expense" name="uomReqexpense"
class="form-control form-control-sm"></select>
</div>
<div class="col-md-2 form-group">
<label>Expected arrival date</label>
@ -433,7 +437,8 @@
</div>
<div class="col-md-5 form-group">
<label>QTY</label>
<input type="number" id="select-tools-qty" name="qty" class="form-control form-control-sm" />
<input type="number" id="select-tools-qty" name="qty"
class="form-control form-control-sm" />
</div>
<div class="col-md-2 form-group">
<button style="margin-top: 31px;" id="btn-assign-tools" type="submit"
@ -494,13 +499,14 @@
</li>
</ul>
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active pt-1" id="days-off" role="tabpanel" aria-labelledby="days-off-tab">
<div class="tab-pane fade show active pt-1" id="days-off" role="tabpanel"
aria-labelledby="days-off-tab">
<div>
<form id="modal_gantt_setting_form">
<div class="form-group">
<label><b>Set Days Off</b></label>
<select name="select_dayoff[]" id="select_dayoff" class="form-control" placeholder="Select Days"
multiple>
<select name="select_dayoff[]" id="select_dayoff" class="form-control"
placeholder="Select Days" multiple>
<option value="0">Sunday</option>
<option value="1">Monday</option>
<option value="2">Tuesday</option>
@ -515,7 +521,8 @@
<div>
<div class="d-flex justify-content-between pr-1 pl-1 mb-1" style="width: 100%;">
<h6><b>Set Holidays</b></h6>
<button id="add-holiday" class="btn btn-sm btn-primary"><i class="fa fa-plus"></i></button>
<button id="add-holiday" class="btn btn-sm btn-primary"><i
class="fa fa-plus"></i></button>
<button id="hide-holiday" class="btn btn-sm btn-primary elm-hide"><i
class="fa fa-chevron-up"></i></button>
</div>
@ -523,7 +530,8 @@
<div class="form-row">
<div class="col-md-3 form-group">
<label>Date</label>
<input id="date_holiday" required type="date" name="date" class="form-control form-control-sm" />
<input id="date_holiday" required type="date" name="date"
class="form-control form-control-sm" />
</div>
<div class="col-md-3 form-group">
<label>Duration</label>
@ -532,12 +540,14 @@
</div>
<div class="col-md-6 form-group">
<label>Description</label>
<textarea id="desc_holiday" type="text" name="description" class="form-control form-control-sm"
<textarea id="desc_holiday" type="text" name="description"
class="form-control form-control-sm"
placeholder="Cuti bersama tahun baru.."></textarea>
</div>
</div>
<div class="text-right">
<button id="btn_add_holiday" type="submit" class="btn btn-sm btn-primary">Add Holiday</button>
<button id="btn_add_holiday" type="submit" class="btn btn-sm btn-primary">Add
Holiday</button>
</div>
<hr />
</form>
@ -618,11 +628,13 @@
<div class="form-row">
<div class="col-md-6 form-group">
<label>Due Date</label>
<input id="due_milestone" type="text" name="due_date" class="form-control form-control-sm" />
<input id="due_milestone" type="text" name="due_date"
class="form-control form-control-sm" />
</div>
<div class="col-md-6 form-group">
<label>Deadline</label>
<input id="deadline_milestone" type="text" name="deadline" class="form-control form-control-sm" />
<input id="deadline_milestone" type="text" name="deadline"
class="form-control form-control-sm" />
</div>
</div>
</div>
@ -693,7 +705,7 @@
<p style="margin-bottom:2px">
<span>End Activity</span> : <span id="report-activity-information-end">-</span>
</p>
<hr/>
<hr />
</div>
<div class="table-responsive">
@ -714,7 +726,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>
@ -739,8 +752,8 @@
</div>
<div class="col-md-2 form-group">
<label>Report Date</label>
<input type="text" id="ra_date_material" name="report_date" class="form-control form-control-sm"
required />
<input type="text" id="ra_date_material" name="report_date"
class="form-control form-control-sm" required />
</div>
<div class="col-md-2 form-group">
<label>Volume Aktual</label>
@ -749,15 +762,18 @@
</div>
<div class="col-md-2 form-group">
<label>Foto</label>
<input type="file" id="foto_ra_material" name="files" class="form-control form-control-sm" />
<input type="file" id="foto_ra_material" name="files"
class="form-control form-control-sm" />
</div>
<div class="col-md-4 form-group">
<label>Keterangan</label>
<textarea id="ra_description_material" class="form-control form-control-sm" name="description"></textarea>
<textarea id="ra_description_material" class="form-control form-control-sm"
name="description"></textarea>
</div>
</div>
<div class="text-right">
<button id="btn_add_ra_material" type="submit" class="btn btn-sm btn-primary" row="1">Add</button>
<button id="btn_add_ra_material" type="submit" class="btn btn-sm btn-primary"
row="1">Add</button>
</div>
<hr />
</form>
@ -815,7 +831,8 @@
<div id="map_activity"></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>
<button type="button" class="btn btn-primary" id="btn_save_location">Save Location</button>
</div>
</div>
@ -838,7 +855,8 @@
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal" aria-label="Close">Cancel</button>
<button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal"
aria-label="Close">Cancel</button>
<button type="button" class="btn btn-primary" id="btn_save_radius">Save Radius</button>
</div>
</div>
@ -856,7 +874,8 @@
<div id="report-image"></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>
<!-- <button type="button" class="btn btn-primary" id="btn_save_location">Save Location</button> -->
</div>
</div>
@ -872,10 +891,10 @@
crossorigin="anonymous"></script> -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous">
</script>
</script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous">
</script>
</script>
<script src="https://cdn.datatables.net/1.11.3/js/jquery.dataTables.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/bbbootstrap/libraries@main/choices.min.js"></script>
@ -914,8 +933,8 @@
<script src="function/reportActivity.js"></script>
<script src="function/activityLocation.js"></script>
<script>
var button = document.getElementById("fullscreen_button");
button.addEventListener("click", function(){
var button = document.getElementById("fullscreen_button");
button.addEventListener("click", function () {
if (!gantt.getState().fullscreen) {
gantt.expand();
}

Write Preview
Loading…
Cancel
Save