From 76e664d647f7aa7d0f6471e96aceb7a7f0e87a0a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 31 May 2024 18:47:18 +0100
Subject: [PATCH] Warn and disable the checkout button if model is invalid

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/hardware/checkin.blade.php | 74 +++++++++++++---------
 1 file changed, 43 insertions(+), 31 deletions(-)

diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index debfdef91c..9bd88f3f4f 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -16,50 +16,56 @@
   </style>
 
 
-  <div class="row">
+  <div class="row"><!-- .row -->
     <!-- left column -->
-    <div class="col-md-9">
-      <div class="box box-default">
-        <div class="box-header with-border">
-          <h2 class="box-title">{{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h2>
+    <div class="col-md-7 col-sm-11 col-xs-12 col-md-offset-2">
+      <div class="box box-default"><!-- .box-default -->
+        <div class="box-header with-border"><!-- .box-header -->
+            <h2 class="box-title">
+              {{ trans('admin/hardware/form.tag') }}
+              {{ $asset->asset_tag }}
+            </h2>
         </div><!-- /.box-header -->
 
-        <div class="box-body">
-          <div class="col-md-12">
-            @if ($backto=='user')
+        <div class="box-body"><!-- .box-body -->
+          <div class="col-md-12"><!-- .col-md-12 -->
+
+            @if ($backto == 'user')
+              <form class="form-horizontal" method="post" action="{{ route('hardware.checkin.store', array('assetId'=> $asset->id, 'backto'=>'user')) }}"  autocomplete="off">
+            @else
               <form class="form-horizontal" method="post"
-                    action="{{ route('hardware.checkin.store', array('assetId'=> $asset->id, 'backto'=>'user')) }}"
-                    autocomplete="off">
-                @else
-                  <form class="form-horizontal" method="post"
-                        action="{{ route('hardware.checkin.store', array('assetId'=> $asset->id)) }}" autocomplete="off">
-                  @endif
+                    action="{{ route('hardware.checkin.store', array('assetId'=> $asset->id)) }}" autocomplete="off">
+            @endif
                   {{csrf_field()}}
 
                   <!-- AssetModel name -->
                     <div class="form-group">
                       {{ Form::label('model', trans('admin/hardware/form.model'), array('class' => 'col-md-3 control-label')) }}
                       <div class="col-md-8">
+
                         <p class="form-control-static">
                           @if (($asset->model) && ($asset->model->name))
                             {{ $asset->model->name }}
-
                           @else
                             <span class="text-danger text-bold">
-                      <i class="fas fa-exclamation-triangle"></i>{{ trans('admin/hardware/general.model_invalid')}}
-                      <a href="{{ route('hardware.edit', $asset->id) }}"></a> {{ trans('admin/hardware/general.model_invalid_fix')}}</span>
+                              <i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
+                              {{ trans('admin/hardware/general.model_invalid')}}
+                            </span>
+                            {{ trans('admin/hardware/general.model_invalid_fix')}}
+                            <a href="{{ route('hardware.edit', $asset->id) }}">
+                              <strong>{{ trans('admin/hardware/general.edit') }}</strong>
+                            </a>
                           @endif
                         </p>
+
                       </div>
                     </div>
- 
 
                     <!-- Asset Name -->
                     <div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
                       {{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }}
                       <div class="col-md-8">
-                        <input class="form-control" type="text" name="name" aria-label="name" id="name"
-                               value="{{ old('name', $asset->name) }}"/>
+                        <input class="form-control" type="text" name="name" aria-label="name" id="name" value="{{ old('name', $asset->name) }}"/>
                         {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                       </div>
                     </div>
@@ -67,7 +73,7 @@
                     <!-- Status -->
                     <div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}">
                       {{ Form::label('status_id', trans('admin/hardware/form.status'), array('class' => 'col-md-3 control-label')) }}
-                      <div class="col-md-7 required">
+                      <div class="col-md-8 required">
                         {{ Form::select('status_id', $statusLabel_list, '', array('class'=>'select2', 'style'=>'width:100%','id' =>'modal-statuslabel_types', 'aria-label'=>'status_id')) }}
                         {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                       </div>
@@ -77,7 +83,9 @@
 
                   <!-- Checkout/Checkin Date -->
                     <div class="form-group{{ $errors->has('checkin_at') ? ' has-error' : '' }}">
+
                       {{ Form::label('checkin_at', trans('admin/hardware/form.checkin_date'), array('class' => 'col-md-3 control-label')) }}
+
                       <div class="col-md-8">
                         <div class="input-group col-md-5 required">
                           <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
@@ -89,25 +97,29 @@
                       </div>
                     </div>
 
-
                     <!-- Note -->
                     <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
-
                       {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
-
                       <div class="col-md-8">
-                  <textarea class="col-md-6 form-control" id="note"
-                            name="note">{{ old('note', $asset->note) }}</textarea>
+                        <textarea class="col-md-6 form-control" id="note" name="note">{{ old('note', $asset->note) }}</textarea>
                         {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                       </div>
                     </div>
-                    @include ('partials.forms.redirect_submit_options', ['route' => 'hardware.index', 'table_name' => $table_name, 'type'=> $asset->model->name, 'checkin' => true])
-                  </form>
-          </div> <!--/.col-md-12-->
-        </div> <!--/.box-body-->
+                    </div> <!--/.box-body-->
+                </div> <!--/.box-body-->
 
-      </div> <!--/.box.box-default-->
+                      @include ('partials.forms.redirect_submit_options',
+                                [
+                                'route' => 'hardware.index',
+                                'table_name' => $table_name,
+                                'type'=> ($asset->model ? $asset->model->name : trans('general.asset_model')),
+                                'checkin' => true
+                      ])
+                  </form>
+
+      </div>
     </div>
   </div>
 
+
 @stop
\ No newline at end of file