From c68d76870eb3dc29bb6d4c5043873ff00d3c0782 Mon Sep 17 00:00:00 2001 From: madd15 Date: Fri, 17 Oct 2014 15:35:56 +1030 Subject: [PATCH 01/11] Change all form to use Form:: & update Lang Updated to Form:: Update static text to Lang Vars --- app/views/backend/settings/edit.blade.php | 27 +++++++++-------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php index d8b53d43ac..864928d922 100755 --- a/app/views/backend/settings/edit.blade.php +++ b/app/views/backend/settings/edit.blade.php @@ -37,26 +37,22 @@ $debugbar["messages"]->addMessage("hello world!");
- - + {{ Form::hidden('_token', csrf_token()) }} + @foreach ($settings as $setting)
- + {{ Form::label('site_name', Lang::get('admin/settings/general.site_name'), array('class' => 'control-label')) }}
- + {{ Form::text('site_name', Input::old('site_name', $setting->site_name), array('class' => 'col-md-9')) }} {{ $errors->first('site_name', ':message') }}
- + {{ Form::label('display_asset_name', Lang::get('admin/settings/general.display_asset_name'), array('class' => 'control-label')) }}
- - display_asset_name === 1 ? 'checked' : '' }}} /> - + {{ Form::checkbox('display_asset_name', '1', Input::old('display_asset_name', $setting->display_asset_name)) }} {{ $errors->first('display_asset_name', ':message') }}
@@ -64,16 +60,15 @@ $debugbar["messages"]->addMessage("hello world!");
- + {{ Form::label('per_page', Lang::get('admin/settings/general.per_page'), array('class' => 'control-label')) }}
- + {{ Form::text('per_page', Input::old('per_page', $setting->per_page))}} {{ $errors->first('per_page', ':message') }}
- + {{ Form::label('qr_code', Lang::get('admin/settings/general.display_qr'), array('class' => 'control-label')) }}
@if ($is_gd_installed) {{ Form::checkbox('qr_code', '1', Input::old('qr_code', $setting->qr_code)) }} @@ -90,10 +85,10 @@ $debugbar["messages"]->addMessage("hello world!");
- + {{ Form::label('qr_text', Lang::get('admin/settings/general.qr_text'), array('class' => 'control-label')) }}
@if ($setting->qr_code === 1) - + {{ Form::text('qr_text', Input::old('qr_text', $setting->qr_text), array('class' => 'col-md-9')) }} @else @lang('admin/settings/general.qr_help') From 692c86159448df83b37ae761008a4013c8a7c7eb Mon Sep 17 00:00:00 2001 From: madd15 Date: Fri, 17 Oct 2014 15:36:31 +1030 Subject: [PATCH 02/11] Updated static text to Lang vars Updated static text to Lang vars --- app/views/backend/settings/index.blade.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/backend/settings/index.blade.php b/app/views/backend/settings/index.blade.php index bde6b2067c..5ae0af1f00 100755 --- a/app/views/backend/settings/index.blade.php +++ b/app/views/backend/settings/index.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') -Settings :: + @lang('admin/settings/general.settings') :: @parent @stop @@ -16,7 +16,7 @@ Settings ::
-

Settings

+

@lang('admin/settings/general.settings')

@@ -29,14 +29,14 @@ Settings :: - - + + @foreach ($settings as $setting) - + @@ -51,11 +51,11 @@ Settings :: - + - + @if ($setting->qr_code === 1) @else @@ -63,7 +63,7 @@ Settings :: @endif - + @endforeach From 0d124281403aef8be7da2e680f867e2035ac9aba Mon Sep 17 00:00:00 2001 From: madd15 Date: Fri, 17 Oct 2014 15:39:58 +1030 Subject: [PATCH 03/11] Reordered, Changed title and added per_page Reordered, Changed title and added per_page --- app/lang/en/admin/settings/general.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/lang/en/admin/settings/general.php b/app/lang/en/admin/settings/general.php index b0d5ed74bd..46e40801eb 100755 --- a/app/lang/en/admin/settings/general.php +++ b/app/lang/en/admin/settings/general.php @@ -1,15 +1,17 @@ 'Display Asset Name', 'display_qr' => 'Display QR Codes', 'info' => 'These settings let you customize certain aspects of your installation.', + 'per_page' => 'Results Per Page', 'php_gd_info' => 'You must install php-gd to display QR codes, see install instructions.', 'php_gd_warning' => 'PHP Image Processing and GD plugin is NOT installed.', 'qr_help' => 'Enable QR Codes first to set this', 'qr_text' => 'QR Code Text', 'setting' => 'Setting', - 'title' => 'Settings', + 'settings' => 'Settings', + 'site_name' => 'Site Name', 'update' => 'Update Settings', 'value' => 'Value', - 'display_asset_name' => 'Display Asset Name', ); From 98b96d372dcbdd8bd5a6a321ba334db2c4dbe79d Mon Sep 17 00:00:00 2001 From: madd15 Date: Fri, 24 Oct 2014 12:29:58 +1030 Subject: [PATCH 04/11] Add Display Checkout Date Setting --- app/views/backend/settings/index.blade.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/views/backend/settings/index.blade.php b/app/views/backend/settings/index.blade.php index 5ae0af1f00..4ff3e29810 100755 --- a/app/views/backend/settings/index.blade.php +++ b/app/views/backend/settings/index.blade.php @@ -49,7 +49,16 @@ @endif + + + + @if ($setting->display_checkout_date === 1) + + @else + + @endif + From 189523a94341eb7e3684ea0fd5021c69a4921a0a Mon Sep 17 00:00:00 2001 From: madd15 Date: Fri, 24 Oct 2014 12:30:51 +1030 Subject: [PATCH 05/11] Add Display Checkout Date Setting --- app/views/backend/settings/edit.blade.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php index 864928d922..00ca0dee24 100755 --- a/app/views/backend/settings/edit.blade.php +++ b/app/views/backend/settings/edit.blade.php @@ -57,7 +57,13 @@ $debugbar["messages"]->addMessage("hello world!"); - +
+ {{ Form::label('display_checkout_date', Lang::get('admin/settings/general.display_checkout_date'), array('class' => 'control-label')) }} +
+ {{ Form::checkbox('display_checkout_date', '1', Input::old('display_checkout_date', $setting->display_checkout_date)) }} + {{ $errors->first('display_checkout_date', ':message') }} +
+
{{ Form::label('per_page', Lang::get('admin/settings/general.per_page'), array('class' => 'control-label')) }} @@ -71,7 +77,7 @@ $debugbar["messages"]->addMessage("hello world!"); {{ Form::label('qr_code', Lang::get('admin/settings/general.display_qr'), array('class' => 'control-label')) }}
@if ($is_gd_installed) - {{ Form::checkbox('qr_code', '1', Input::old('qr_code', $setting->qr_code)) }} + {{ Form::checkbox('qr_code', '1', Input::old('qr_code', $setting->qr_code)) }} @else @@ -122,5 +128,4 @@ $debugbar["messages"]->addMessage("hello world!");
- @stop From d74bddb51fe434d25c63353d77e7edeaf2a30e46 Mon Sep 17 00:00:00 2001 From: madd15 Date: Fri, 24 Oct 2014 12:32:06 +1030 Subject: [PATCH 06/11] Add display_checkout_date --- app/lang/en/admin/settings/general.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/lang/en/admin/settings/general.php b/app/lang/en/admin/settings/general.php index 46e40801eb..0bbf434d51 100755 --- a/app/lang/en/admin/settings/general.php +++ b/app/lang/en/admin/settings/general.php @@ -2,6 +2,7 @@ return array( 'display_asset_name' => 'Display Asset Name', + 'display_checkout_date' => 'Display Checkout Date', 'display_qr' => 'Display QR Codes', 'info' => 'These settings let you customize certain aspects of your installation.', 'per_page' => 'Results Per Page', From b0e1ef6024b1962f3876aa04ae867517987cabb2 Mon Sep 17 00:00:00 2001 From: madd15 Date: Fri, 24 Oct 2014 12:32:44 +1030 Subject: [PATCH 07/11] Add Display Checkout Date --- app/controllers/admin/SettingsController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/admin/SettingsController.php b/app/controllers/admin/SettingsController.php index 0b235de523..de0fcdacaa 100755 --- a/app/controllers/admin/SettingsController.php +++ b/app/controllers/admin/SettingsController.php @@ -82,6 +82,7 @@ class SettingsController extends AdminController $setting->id = '1'; $setting->site_name = e(Input::get('site_name')); $setting->display_asset_name = e(Input::get('display_asset_name', '0')); + $setting->display_checkout_date = e(Input::get('display_checkout_date', '0')); $setting->per_page = e(Input::get('per_page')); $setting->qr_code = e(Input::get('qr_code', '0')); $setting->qr_text = e(Input::get('qr_text')); From 024972e23959ce88463c9ea84bd0350715aa0410 Mon Sep 17 00:00:00 2001 From: madd15 Date: Fri, 24 Oct 2014 12:35:42 +1030 Subject: [PATCH 08/11] Add Checkout Date column --- app/views/backend/hardware/index.blade.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index ed5c5a5e7e..0afc0e22b5 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -61,6 +61,9 @@ $debugbar["messages"]->addMessage("hello world!");
+ @if (Input::get('Deployed') && Setting::getSettings()->display_checkout_date) + + @endif @@ -113,7 +116,17 @@ $debugbar["messages"]->addMessage("hello world!"); @endif - + @if (Input::get('Deployed') && Setting::getSettings()->display_checkout_date) + + @endif @endif
SettingValue@lang('admin/settings/general.setting')@lang('admin/settings/general.value')
Site Name@lang('admin/settings/general.site_name') {{{ $setting->site_name }}}
Per Page@lang('admin/settings/general.per_page') {{{ $setting->per_page }}}
Display QR Codes@lang('admin/settings/general.display_qr')Yes
QR Code Text@lang('admin/settings/general.qr_text') {{{ $setting->qr_text }}}
No
@lang('admin/settings/general.display_checkout_date')YesNo
@lang('admin/settings/general.per_page') {{{ $setting->per_page }}} @lang('general.status') @lang('admin/hardware/table.location')@lang('admin/hardware/table.checkout_date')@lang('admin/hardware/table.eol') @lang('admin/hardware/table.change') @lang('table.actions') + @if (count($asset->assetlog) > 0) + @foreach ($asset->assetlog as $log) + @if ($log->action_type == "checkout") + {{{ $log->added_on }}} + @endif + @endforeach + @endif + @if ($asset->model->eol) {{{ $asset->eol_date() }}} From 9125def119b3bd226b24b4b4c46309632426b6e1 Mon Sep 17 00:00:00 2001 From: madd15 Date: Fri, 24 Oct 2014 12:41:25 +1030 Subject: [PATCH 09/11] Add checkout_date --- app/lang/en/admin/hardware/table.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/lang/en/admin/hardware/table.php b/app/lang/en/admin/hardware/table.php index 33b042f056..2a5a60e1f0 100755 --- a/app/lang/en/admin/hardware/table.php +++ b/app/lang/en/admin/hardware/table.php @@ -6,6 +6,7 @@ return array( 'asset_model' => 'Model', 'book_value' => 'Value', 'change' => 'In/Out', + 'checkout_date' => 'Checkout Date', 'checkoutto' => 'Checked Out', 'diff' => 'Diff', 'dl_csv' => 'Download CSV', From 7f44d6dd472e561389254923bb468c749a049ced Mon Sep 17 00:00:00 2001 From: madd15 Date: Fri, 24 Oct 2014 12:48:04 +1030 Subject: [PATCH 10/11] Add display_checkout_date to settings table --- ...10_24_015641_add_display_checkout_date.php | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 app/database/migrations/2014_10_24_015641_add_display_checkout_date.php diff --git a/app/database/migrations/2014_10_24_015641_add_display_checkout_date.php b/app/database/migrations/2014_10_24_015641_add_display_checkout_date.php new file mode 100644 index 0000000000..872a051c49 --- /dev/null +++ b/app/database/migrations/2014_10_24_015641_add_display_checkout_date.php @@ -0,0 +1,33 @@ +integer('display_checkout_date')->nullable()->default(NULL); + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('settings', function ($table) { + $table->dropColumn('display_checkout_date'); + }); + } + +} From a6cd7c0babd1cd7f4395ffaf1b7d0c744b32b4a6 Mon Sep 17 00:00:00 2001 From: madd15 Date: Fri, 24 Oct 2014 13:07:57 +1030 Subject: [PATCH 11/11] Changed to only one date for checkout date --- app/views/backend/hardware/index.blade.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index 0afc0e22b5..4e66a9094d 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -119,11 +119,7 @@ $debugbar["messages"]->addMessage("hello world!"); @if (Input::get('Deployed') && Setting::getSettings()->display_checkout_date) @if (count($asset->assetlog) > 0) - @foreach ($asset->assetlog as $log) - @if ($log->action_type == "checkout") - {{{ $log->added_on }}} - @endif - @endforeach + {{{ $asset->assetlog->first()->added_on }}} @endif