indicazioni fabio

app/Http/Controllers/IssueController.php

@@ -135,6 +135,27 @@ class IssueController extends Controller
   }
 
   public function firma_rapporto(Request $request){
+
+    // Controllo orari e durata intervento
+    try{
+      $inizio = Carbon::createFromFormat('H:i', $request->ora_inizio);
+      $fine = Carbon::createFromFormat('H:i', $request->ora_fine);
+      $durata = $fine->diffInMinutes($inizio);
+      $orePausa = floatval($request->ore_pausa);
+      if($orePausa > 0){
+        $minutiPausa = 60*$orePausa;
+        $durata -= $minutiPausa;
+      }
+
+      if($durata <= 0){
+        return back()->withErrors(['msg' => 'La durata complessiva dell\'intervento non deve essere minore di 0. Controlla orario di inizio, fine e pausa']);
+      }
+    }catch(\Exception $e){
+      return back()->withErrors(['msg' => 'Orari non validi']);
+    }
+
+
+
     $redmineUser = session('redmine_user');
     $user = User::where('redmine_id', $redmineUser->id)->first();
 
@@ -151,9 +172,6 @@ class IssueController extends Controller
     // Cliente
     $cliente = $issue->project->name;
 
-    $inizio = Carbon::createFromFormat('H:i', $request->ora_inizio);
-    $fine = Carbon::createFromFormat('H:i', $request->ora_fine);
-    $durata = $fine->diffInMinutes($inizio);
     $dataIntervento = Carbon::createFromFormat('d/m/Y', $request->spent_on);
 
     // Array dei tecnici presenti
@@ -276,14 +294,6 @@ class IssueController extends Controller
     // Elimino le firme
     Storage::disk('temp')->delete([$sign_path_cliente]);
 
-    $timeEntry = [
-      'issue_id' => $request->issue_id,
-      'spent_on' => $dataIntervento->toDateString(),
-      'hours' => $durata.'m',
-      'comments' => $request->note,
-      'activity_id' => $request->activity_id
-    ];
-
     // Aggiorno lo issue
     $response = Http::acceptJson()->put("https://".$redmineUser->api_key."@".session('azienda')->redmine_url.'/issues/'.$request->issue_id.'.xml', [
       'issue' => [
@@ -291,13 +301,13 @@ class IssueController extends Controller
         'status_id' => $request->status_id,
         'uploads' => $uploads
       ],
-      // 'time_entry' => $timeEntry,
       'helpdesk' => [
         'is_send_mail' => 1
       ],
     ]);
 
     $response->throw(function ($response, $e) {
+      dd($e);
       Session::flash('flash_message', "Errore nell'update dell'issue");
       return redirect()->route('home');
     });
@@ -331,7 +341,14 @@ class IssueController extends Controller
             'hours' => $request->ore_viaggio,
             'comments' => '',
             'activity_id' => Config::getValue(Config::ATTIVITA_VIAGGIO),
-            'user_id' => $key
+            'user_id' => $key,
+            'custom_fields' => [
+              [
+                'id' => 5,
+                'value' => 'Viaggio' // Campo Custom fatturare
+              ]
+            ]
+
           ]
         ]);
 

resources/views/components/auth-validation-errors.blade.php

@@ -3,7 +3,7 @@
 @if ($errors->any())
     <div {{ $attributes }}>
         <div class="font-medium text-red-600">
-            {{ __('Whoops! Something went wrong.') }}
+            {{ __('Rivedi i dati inseriti.') }}
         </div>
 
         <ul class="mt-3 list-disc list-inside text-sm text-red-600">

resources/views/issue/firma.blade.php

@@ -51,6 +51,7 @@ use App\Models\Config;
         <div class="card-header"><i class="fas fa-info"></i> Dettagli intervento</div>
         <div class="card-body">
 
+          <x-auth-validation-errors class="mb-4" :errors="$errors" />
 
           <div class="form-row">
             <div class="form-group col-md">
@@ -95,6 +96,11 @@ use App\Models\Config;
               {!! Form::text('ora_fine', Carbon::now()->addMinutes(15)->format('H:i'), ['class' => 'form-control']) !!}
             </div>
 
+            <div class="form-group col-md">
+              {!! Form::label('ore_pausa', 'Ore pausa') !!}
+              {!! Form::number('ore_pausa', 0, ['class' => 'form-control', 'step' => '0,01']) !!}
+            </div>
+
             <div class="form-group col-md" id="div_button_ore_viaggio">
               <button class="btn btn-primary" onclick="imputa_ore_viaggio()" type="button">Imputa ore viaggio</button>
             </div>