mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Added inches to papertype / extended logic for inches

pull/2369/head
int2001 2023-08-04 04:45:10 +00:00
rodzic 45e057c261
commit 14cff47f04
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: DFB1C13CD2DB037B
3 zmienionych plików z 11 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
application/controllers/Labels.php
Wyświetl plik

@ -163,6 +163,13 @@ class Labels extends CI_Controller {
$label->font='DejaVuSans'; // Fix font to DejaVuSans
$ptype=$this->labels_model->getPaperType($label->paper_type_id); // fetch papersize out of paper-table
if (($ptype->paper_id ?? '') != '') {
if ($ptype->metric == 'in') { // convert papersize to mm if given in inch
$paper_width=$ptype->width*25.4;
$paper_height=$ptype->height*25.4;
} else {
$paper_width=$ptype->width;
$paper_height=$ptype->height;
}
$pdf = new PDF_Label(array(
'paper-size' => 'custom', // $label->paper_type, // The only Type left is "custom" because A4 and so on are also defined at paper_types
'metric' => $label->metric,
@ -175,8 +182,8 @@ class Labels extends CI_Controller {
'width' => $label->width,
'height' => $label->height,
'font-size' => $label->font_size,
'pgX' => $ptype->width,
'pgY' => $ptype->height
'pgX' => $paper_width,
'pgY' => $paper_height
));
} else {
if ($jscall) {

2
application/views/labels/createpaper.php
Wyświetl plik

@ -42,7 +42,7 @@
<div class="col-sm-4">
<select name="measurementType" class="form-control" id="measurementType">
<option selected value="mm">Millimeters</option>
<!-- <option value="in">Inches</option> -->
<option value="in">Inches</option>
</select>
</div>
</div>

2
application/views/labels/editpaper.php
Wyświetl plik

@ -42,7 +42,7 @@
<div class="col-sm-4">
<select name="measurementType" class="form-control" id="measurementType">
<option value="mm" <?php if($paper->metric == "mm") { echo "selected=\"selected\""; } ?>>Millimeters</option>
<!-- <option value="in" <?php if($paper->metric == "in") { echo "selected=\"selected\""; } ?>>Inches</option> -->
<option value="in" <?php if($paper->metric == "in") { echo "selected=\"selected\""; } ?>>Inches</option>
</select>
</div>
</div>