Added support for grid when printing from the advanced logbook
这个提交包含在:
父节点
391e9d084c
当前提交
bcff9dd102
共有 4 个文件被更改,包括 21 次插入 和 6 次删除
|
|
@ -133,7 +133,7 @@ class Labels extends CI_Controller {
|
|||
public function printids() {
|
||||
$ids = xss_clean(json_decode($this->input->post('id')));
|
||||
$offset = xss_clean($this->input->post('startat'));
|
||||
$grid = xss_clean($this->input->post('grid') ?? 0);
|
||||
$grid = $this->input->post('grid') === "true" ? 1 : 0;
|
||||
$this->load->model('labels_model');
|
||||
$result = $this->labels_model->export_printrequestedids($ids);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<form method="post" class="col-md" action="<?php echo site_url('labels/print/'.$stationid) ?>">
|
||||
<div class="form-group row">
|
||||
<label class="my-1 mr-2 col-md-4" for="qsl">Include Grid?</label>
|
||||
<label class="my-1 mr-2 col-md-4" for="grid">Include Grid?</label>
|
||||
<div class="form-check-inline">
|
||||
<input class="form-check-input" type="checkbox" name="grid" id="grid">
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,17 @@
|
|||
<form method="post" class="form-inline">
|
||||
<input class="form-control input-group-sm" type="number" id="startat" name="startat" value="1">
|
||||
<button type="button" id="button1id" name="button1id" class="btn btn-primary ld-ext-right" onclick="printlabel();">Print</button>
|
||||
<form method="post" class="col-md">
|
||||
<div class="form-group row">
|
||||
<label class="my-1 mr-2 col-md-4" for="gridlabel">Include Grid?</label>
|
||||
<div class="form-check-inline">
|
||||
<input class="form-check-input" type="checkbox" name="gridlabel" id="gridlabel">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label class="my-1 mr-2 col-md-4" for="startat">Start printing at?</label>
|
||||
<div class="form-inline">
|
||||
<input class="form-control input-group-sm" type="number" id="startat" name="startat" value="1">
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-left">
|
||||
<button type="button" id="button1id" name="button1id" class="btn btn-primary ld-ext-right" onclick="printlabel();">Print</button>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -585,7 +585,9 @@ function printlabel() {
|
|||
url: base_url + 'index.php/labels/printids',
|
||||
type: 'post',
|
||||
data: {'id': JSON.stringify(id_list, null, 2),
|
||||
'startat': $('#startat').val()
|
||||
'startat': $('#startat').val(),
|
||||
'grid': $('#gridlabel')[0].checked,
|
||||
|
||||
},
|
||||
xhr:function(){
|
||||
var xhr = new XMLHttpRequest();
|
||||
|
|
|
|||
正在加载…
在新工单中引用