DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added option to include model information on asset labels. (#5301)

Browse source 
* Added option to include model information on asset labels.

Cleaned up label page to fix skewed label alignment on last row per page.

* Changes made per Snipe's direction

changed type from tinyint to boolean in DB
changed labels back to initials
This commit is contained in:
Jason 2018-07-12 18:23:12 -07:00 committed by snipe
parent 980dccf31c
commit 98b20fc1cd
4 changed files with 65 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/SettingsController.php
View file

@ -807,7 +807,13 @@ class SettingsController extends Controller
$setting->labels_display_tag = 1;
} else {
$setting->labels_display_tag = 0;
}
}
if (Input::has('labels_display_tag')) {
$setting->labels_display_tag = 1;
} else {
$setting->labels_display_tag = 0;
}
if ($setting->save()) {
return redirect()->route('settings.index')

34
database/migrations/2018_04_02_150700__labels_display_model.php Normal file
View file

@ -0,0 +1,34 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class LabelsDisplayCompanyName extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('settings', function (Blueprint $table) {
$table->boolean('labels_display_model')->default(0);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('settings', function ($table) {
$table->dropColumn(
'labels_display_model'
);
});
}
}

22
resources/views/hardware/labels.blade.php
View file

@ -11,7 +11,7 @@
$settings->labels_width = $settings->labels_width - $settings->labels_display_sgutter;
$settings->labels_height = $settings->labels_height - $settings->labels_display_bgutter;
// Leave space on bottom for 1D barcode if necessary
$qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='') ? $settings->labels_height - .25 : $settings->labels_height;
$qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='') ? $settings->labels_height - .3 : $settings->labels_height - .3;
// Leave space on left for QR code if necessary
$qr_txt_size = ($settings->qr_code=='1' ? $settings->labels_width - $qr_size - .1: $settings->labels_width);
?>
@ -60,7 +60,7 @@
.qr_text {
width: {{ $qr_txt_size }}in;
height: {{ $qr_size }}in;
padding-top: .01in;
padding-top: .10in;
font-family: arial, helvetica, sans-serif;
padding-right: .01in;
overflow: hidden !important;
@ -75,6 +75,12 @@
display: inline;
height: 50px;
}
.next-padding {
margin: {{ $settings->labels_pmargin_top }}in {{ $settings->labels_pmargin_right }}in {{ $settings->labels_pmargin_bottom }}in {{ $settings->labels_pmargin_left }}in;
}
@media print {
.noprint {
@ -104,7 +110,7 @@
@foreach ($assets as $asset)
<?php $count++; ?>
<div class="label"{!! ($count % $settings->labels_per_page == 0) ? ' style="margin-bottom: 0px;"' : '' !!}>
<div class="label">
@if ($settings->qr_code=='1')
<div class="qr_img">
@ -130,7 +136,7 @@
</div>
@endif
@if (($settings->labels_display_tag=='1') && ($asset->asset_tag!=''))
<div class="pull-left">
<div class="pull-left">
T: {{ $asset->asset_tag }}
</div>
@endif
@ -138,7 +144,13 @@
<div class="pull-left">
S: {{ $asset->serial }}
</div>
@endif
@endif
@if (($settings->labels_display_model=='1') && ($asset->model->name!=''))
<div class="pull-left">
M: {{ $asset->model->name }} {{ $asset->model->model_number }}
</div>
@endif
</div>
@if ((($settings->alt_barcode_enabled=='1') && $settings->alt_barcode!=''))

9
resources/views/settings/labels.blade.php
View file

@ -163,7 +163,7 @@
<div class="form-group">
<div class="col-md-3">
{{ Form::label('labels_width', trans('admin/settings/general.label_fields')) }}
{{ Form::label('labels_width', trans('admin/settings/general.label_fields')) }}
</div>
<div class="col-md-9">
<div class="checkbox">
@ -178,11 +178,16 @@
<label>
{{ Form::checkbox('labels_display_tag', '1', Input::old('labels_display_tag', $setting->labels_display_tag),['class' => 'minimal']) }}
{{ trans('admin/hardware/form.tag') }}
</label>
<label>
{{ Form::checkbox('labels_display_model', '1', Input::old('labels_display_model', $setting->labels_display_model),['class' => 'minimal']) }}
{{ trans('admin/hardware/form.model') }}
</label>
<label>
{{ Form::checkbox('labels_display_company_name', '1', Input::old('labels_display_company_name', $setting->labels_display_company_name),['class' => 'minimal']) }}
{{ trans('admin/companies/table.name') }}
</label>
</label>
</div> <!--/.CHECKBOX-->
</div> <!--/.col-md-9-->
</div> <!--/.form-group-->