Ore viaggio e attività da completare

app/Http/Controllers/IssueController.php

@@ -11,6 +11,7 @@ use Illuminate\Support\Facades\Log;
 use App\DataTables\IssueDataTable;
 use App\Models\Issue;
 use App\Models\User;
+use App\Models\Config;
 use Carbon\Carbon;
 use PDF;
 use Storage;
@@ -69,23 +70,19 @@ class IssueController extends Controller
 
     // Sede del cliente
     $sedeCliente = null;
-    foreach($issue->custom_fields as $custom_field){
-      if(str_starts_with($custom_field->name, 'Sede')){
-        $sedeCliente = $custom_field->value;
-        break;
+    try{
+      foreach($issue->custom_fields as $custom_field){
+        if(str_starts_with($custom_field->name, 'Sede')){
+          $sedeCliente = $custom_field->value;
+          break;
+        }
       }
+    }catch(\Exception $e){
+      $sedeCliente = null;
     }
 
     // Activity
-    $response = Http::get(session('azienda')->redmine_url.'/enumerations/time_entry_activities.json', [
-      'key' => $redmineUser->api_key,
-    ]);
-
-    $attivita = array();
-    foreach($response->object()->time_entry_activities as $time_entry_activities){
-      if(!$time_entry_activities->active) continue;
-      $attivita[$time_entry_activities->id] = $time_entry_activities->name;
-    }
+    $attivita = Issue::getAttivita();
 
     // issueStatus
     $issueStatus = Issue::getStati();
@@ -307,16 +304,38 @@ class IssueController extends Controller
 
     // Time entry
     foreach($tecnici as $key => $value){
+      // ore intervento
+      if($key == $redmineUser->id){
+        $activity_id = $request->activity_id;
+      }else{
+        $activity_id = Config::getValue(Config::ATTIVITA_TECNICO_AGGIUNTIVO);
+      }
+
       $response = Http::post("https://".$redmineUser->api_key."@".session('azienda')->redmine_url.'/time_entries.xml', [
         'time_entry' => [
           'issue_id' => $request->issue_id,
           'spent_on' => $dataIntervento->toDateString(),
           'hours' => $durata.'m',
           'comments' => $request->note,
-          'activity_id' => $request->activity_id,
+          'activity_id' => $activity_id,
           'user_id' => $key
         ]
       ]);
+
+      // Ore viaggio
+      if($request->has('ore_viaggio') && is_numeric($request->ore_viaggio)){
+        $response = Http::post("https://".$redmineUser->api_key."@".session('azienda')->redmine_url.'/time_entries.xml', [
+          'time_entry' => [
+            'issue_id' => $request->issue_id,
+            'spent_on' => $dataIntervento->toDateString(),
+            'hours' => $request->ore_viaggio,
+            'comments' => '',
+            'activity_id' => Config::getValue(Config::ATTIVITA_VIAGGIO),
+            'user_id' => $key
+          ]
+        ]);
+
+      }
     }
 
 

app/Models/Config.php

@@ -6,12 +6,18 @@ class Config extends \App\Models\AbstractModels\AbstractConfig
 {
   const STATI_SEGNALAZIONI_HOME = 'stati_segnalazioni_home';
   const TESTO_PRIVACY = 'testo_privacy';
+  const STATO_DA_COMPLETARE = 'stato_da_completare';
+  const ATTIVITA_VIAGGIO = 'attivita_viaggio';
+  const ATTIVITA_TECNICO_AGGIUNTIVO = 'attivita_tecnico_aggiuntivo';
 
   public static function getConfig(){
     $config = [];
     $config['Generale'] = [
       ['key' => self::STATI_SEGNALAZIONI_HOME, 'value' => null, 'display_name' => 'Stati delle segnalazioni da mostrare nella home', 'type' => 'array_status'],
+      ['key' => self::STATO_DA_COMPLETARE, 'value' => null, 'display_name' => 'Stato "da completare"', 'type' => 'select_status'],
       ['key' => self::TESTO_PRIVACY, 'value' => null, 'display_name' => 'Testo privacy in calce al pdf', 'type' => 'textarea'],
+      ['key' => self::ATTIVITA_VIAGGIO, 'value' => null, 'display_name' => 'Attività "Viaggio"', 'type' => 'activity'],
+      ['key' => self::ATTIVITA_TECNICO_AGGIUNTIVO, 'value' => null, 'display_name' => 'Attività "tecnico aggiuntivo"', 'type' => 'activity'],
     ];
 
 

app/Models/Issue.php

@@ -70,4 +70,21 @@ class Issue{
     return $issueStatus;
   }
 
+  public static function getAttivita(){
+    $redmineUser = session('redmine_user');
+
+    // Activity
+    $response = Http::get(session('azienda')->redmine_url.'/enumerations/time_entry_activities.json', [
+      'key' => $redmineUser->api_key,
+    ]);
+
+    $attivita = array();
+    foreach($response->object()->time_entry_activities as $time_entry_activities){
+      if(!$time_entry_activities->active) continue;
+      $attivita[$time_entry_activities->id] = $time_entry_activities->name;
+    }
+
+    return $attivita;
+  }
+
 }

resources/views/config/index.blade.php

@@ -68,6 +68,14 @@ thead select{
               ?>
               @break
 
+              @case('select_status')
+              {!! Form::select('value['.$config->id.']', Issue::getStati(), $config->value, ['class' => 'form-control']) !!}
+              @break
+
+              @case('activity')
+              {!! Form::select('value['.$config->id.']', Issue::getAttivita(), $config->value, ['class' => 'form-control']) !!}
+              @break
+
               @case('file')
               <div class="form-row">
                 <div class="form-group col">

resources/views/issue/firma.blade.php

@@ -1,5 +1,6 @@
 <?php
 use Carbon\Carbon;
+use App\Models\Config;
 ?>
 <style>
 [type="file"] {
@@ -41,7 +42,7 @@ use Carbon\Carbon;
     </h2>
   </x-slot>
 
-  {!! Form::open(['route' => 'issue.firma_rapporto', 'files' => true]) !!}
+  {!! Form::open(['route' => 'issue.firma_rapporto', 'files' => true, 'id' => 'form_firma']) !!}
   {!! Form::hidden('issue_id', $issue->id) !!}
 
   <div class="row justify-content-center mb-4">
@@ -62,9 +63,9 @@ use Carbon\Carbon;
               {!! Form::select('activity_id', $attivita, null, ['class' => 'form-control']) !!}
             </div>
 
-            <div class="form-group col-md">
+            <div class="form-group col-md" id="div_stato_segnalazione" style="display: none">
               {!! Form::label('status_id', 'Stato segnalazione') !!}
-              {!! Form::select('status_id', $issueStatus, $issue->status->id, ['class' => 'form-control']) !!}
+              {!! Form::select('status_id', $issueStatus, Config::getValue(Config::STATO_DA_COMPLETARE), ['class' => 'form-control']) !!}
             </div>
           </div>
 
@@ -93,6 +94,15 @@ use Carbon\Carbon;
               {!! Form::label('ora_fine', 'Fine') !!}
               {!! Form::text('ora_fine', Carbon::now()->addMinutes(15)->format('H:i'), ['class' => 'form-control']) !!}
             </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>
+
+            <div class="form-group col-md" id="div_ore_viaggio" style="display: none">
+              {!! Form::label('ore_viaggio', 'Ore viaggio') !!}
+              {!! Form::number('ore_viaggio', null, ['class' => 'form-control', 'min' => 0, 'step' => 0,01]) !!}
+            </div>
           </div>
 
           <div class="form-row">
@@ -225,7 +235,7 @@ use Carbon\Carbon;
 
           <div class="form-row">
             <div class="form-group col-md">
-              <button type="submit" class="btn btn-primary">Salva</button>
+              <button type="button" onclick="submitForm()" class="btn btn-primary">Salva</button>
             </div>
           </div>
 
@@ -348,4 +358,23 @@ function file_selezionato(input){
   }
 }
 
+function imputa_ore_viaggio(){
+  $('#div_stato_segnalazione').show();
+  $('#div_button_ore_viaggio').hide();
+  $('#div_ore_viaggio').show();
+}
+
+function submitForm(){
+  // controllo se le ore del viaggio sono state imputate
+  if($("#div_ore_viaggio").is(":visible") && isNaN(parseInt($('#ore_viaggio').val()))){
+    bootbox.alert("Devi imputare le ore di viaggio!");
+    return;
+  }
+
+  if($('#signature_image_cliente').val() == ''){
+    bootbox.alert("Manca la firma del cliente!");
+    return;
+  }
+  $('#form_firma').submit();
+}
 </script>