custom fields e grafica

app/Console/Kernel.php

@@ -16,6 +16,7 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
         // $schedule->command('inspire')->hourly();
+        $schedule->command('auth:clear-resets')->everyFifteenMinutes();
     }
 
     /**

app/Http/Controllers/IssueController.php

@@ -181,6 +181,12 @@ class IssueController extends Controller
     $descrizione .= "Descrizione problema: ".$request->description;
 
 
+    $customFields = [];
+    if($request->has('cf')){
+      foreach($request->cf as $key => $value){
+        $customFields[] = ['id' => $key, 'value' => $value];
+      }
+    }
     $response = Http::acceptJson()->post("https://".config('redmine.url').'/issues.xml', [
       'key' => $redmineUser->api_key,
       'customer_address' => $contact_id,
@@ -190,6 +196,7 @@ class IssueController extends Controller
         'subject' => $request->subject,
         'description' => $descrizione,
         'uploads' => $uploads,
+        'custom_fields' => $customFields
       ],
     ]);
 
@@ -201,4 +208,33 @@ class IssueController extends Controller
     Session::flash('flash_message', "Grazie, abbiamo ricevuto la tua segnalazione!");
     return redirect()->route('dashboard');
   }
+
+  public function load_custom_fields(Request $request){
+    $redmineUser = session('redmine_user');
+    $customCollection = new Collection();
+
+    $projectResponse = Http::get(config('redmine.url').'/projects.json', [
+      'key' => $redmineUser->api_key,
+      'id' => $request->project_id,
+      'include' => 'issue_custom_fields'
+    ]);
+
+
+    foreach($projectResponse->object()->projects as $project){
+      foreach($project->issue_custom_fields as $issue_custom_field){
+        $response = Http::get(config('redmine.url').'/custom_fields.json', [
+          'key' => $redmineUser->api_key,
+        ]);
+
+        foreach($response->object()->custom_fields as $custom_field){
+          if($custom_field->id == $issue_custom_field->id){
+            $customCollection->push($custom_field);
+          }
+        }
+
+      }
+    }
+
+    return view('issue.custom_field')->with(['customCollection' => $customCollection]);
+  }
 }

app/Models/Issue.php

@@ -61,9 +61,23 @@ class Issue{
 
     ]);
 
+    $last_date = null;
     try{
       foreach($issueResponse->object()->time_entries as $time){
-        $collection->push($time);
+        // $collection->push($time);
+        if($last_date == null){
+          $last_date = $time;
+        }else{
+          if($last_date->spent_on == $time->spent_on){
+            $last_date->hours += $time->hours;
+          }else{
+            $collection->push($last_date);
+            $last_date = $time;
+          }
+        }
+      }
+      if($last_date != null){
+        $collection->push($last_date);
       }
     }catch(\Exception $e){
     }
@@ -111,6 +125,8 @@ class Issue{
       'customized_type' => 'time_entry'
     ]);
 
+    // dd($response->object()->custom_fields);
+
     $custom = array();
     foreach($response->object()->custom_fields as $custom_field){
       $custom[$custom_field->id] = $custom_field->name;

app/Notifications/ResetPasswordNotification.php

@@ -45,7 +45,7 @@ class ResetPasswordNotification extends Notification
     ->subject('Reset password')
     ->line('Hai ricevuto questa email perché abbiamo ricevuto una richiesta di reimpostazione della password per il tuo account.')
     ->action('Reset Password', $this->url)
-    ->line('Questo link per la reimpostazione della password scadrà tra :count minuti.', ['count' => config('auth.passwords.'.config('auth.defaults.passwords').'.expire')])
+    ->line("Questo link per la reimpostazione della password scadrà tra ".config('auth.passwords.'.config('auth.defaults.passwords').'.expire')." minuti.")
     ->line('Se non hai richiesto la reimpostazione della password, non sono necessarie ulteriori azioni.');
   }
 

resources/views/auth/confirm-password.blade.php

@@ -2,7 +2,7 @@
     <x-auth-card>
         <x-slot name="logo">
             <a href="/">
-                <x-application-logo class="w-20 h-20 fill-current text-gray-500" />
+                <x-application-logo class="h-20 fill-current text-gray-500" />
             </a>
         </x-slot>
 

resources/views/auth/forgot-password.blade.php

@@ -2,7 +2,7 @@
     <x-auth-card>
         <x-slot name="logo">
             <a href="/">
-                <x-application-logo class="w-20 h-20 fill-current text-gray-500" />
+                <x-application-logo class="h-20 fill-current text-gray-500" />
             </a>
         </x-slot>
 
@@ -28,7 +28,7 @@
 
             <div class="flex items-center justify-end mt-4">
                 <x-button>
-                    {{ __('Invia lik di reset password') }}
+                    {{ __('Invia link di reset password') }}
                 </x-button>
             </div>
         </form>

resources/views/auth/reset-password.blade.php

@@ -2,7 +2,7 @@
     <x-auth-card>
         <x-slot name="logo">
             <a href="/">
-                <x-application-logo class="w-20 h-20 fill-current text-gray-500" />
+                <x-application-logo class="h-20 fill-current text-gray-500" />
             </a>
         </x-slot>
 

resources/views/auth/verify-email.blade.php

@@ -2,7 +2,7 @@
     <x-auth-card>
         <x-slot name="logo">
             <a href="/">
-                <x-application-logo class="w-20 h-20 fill-current text-gray-500" />
+                <x-application-logo class="h-20 fill-current text-gray-500" />
             </a>
         </x-slot>
 

resources/views/issue/custom_field.blade.php

@@ -0,0 +1,39 @@
+@foreach($customCollection as $custom)
+<div class="form-group col-md-6">
+  {!! Form::label('label_'.$custom->id, $custom->name) !!}
+  @switch($custom->field_format)
+
+  @case('string')
+  {!! Form::text('cf['.$custom->id.']', null, ['class' => 'form-control']) !!}
+  @break
+  @endcase
+
+  @case('sql')
+  <select class="form-control" name="cf[{{$custom->id}}]">
+    @foreach($custom->possible_values as $values)
+    <option id="{{ $values->value}}">{{ $values->label}}</option>
+    @endforeach
+  </select>
+  @break
+  @endcase
+
+  @case('list')
+  <select class="form-control" name="cf[{{$custom->id}}]">
+    @foreach($custom->possible_values as $values)
+    <option id="{{ $values->value}}">{{ $values->label}}</option>
+    @endforeach
+  </select>
+  @break
+  @endcase
+
+  @case('bool')
+  {!! Form::radio('cf['.$custom->id.']', 1, null, ['class' => '']) !!} SI
+  {!! Form::radio('cf['.$custom->id.']', 0, null, ['class' => '']) !!} NO
+  @break
+  @endcase
+
+  @endswitch
+
+
+</div>
+@endforeach

resources/views/issue/nuovo.blade.php

@@ -14,6 +14,8 @@ $projectResponse = Http::get(config('redmine.url').'/projects.json', [
   'id' => implode('|', $progettiUser)
 ]);
 
+// dd($projectResponse->object()->projects);
+
 foreach($projectResponse->object()->projects as $project){
   $progettiCollection->push($project);
 }
@@ -41,19 +43,20 @@ foreach($projectResponse->object()->projects as $project){
           {!! Form::open(['route' => 'issue.crea', 'files' => true]) !!}
 
           <div class="form-row">
-          @if($progettiCollection->count() > 1)
-            <div class="form-group col-md">
-              {!! Form::label('project_id', 'Progetto') !!}
-              {!! Form::select('project_id', $progettiCollection->pluck('name', 'id'), old('project_id'), ['class' => 'form-control']) !!}
-            </div>
-          @else
-          {!! Form::hidden('project_id', $progettiCollection->first()->id) !!}
-          @endif
-
           <div class="form-group col-md">
             {!! Form::label('tipo_richiesta', 'Tipologia di richiesta') !!}
             {!! Form::select('tipo_richiesta', Issue::tipologiaRichieste(), old('tipo_richiesta'), ['class' => 'form-control']) !!}
           </div>
+
+          <div class="form-group col-md">
+            {!! Form::label('referente', 'Referente per la problematica') !!}
+            {!! Form::text('referente', old('referente'), ['class' => 'form-control']) !!}
+          </div>
+
+          <div class="form-group col-md">
+            {!! Form::label('telefono', 'Numero di telefono') !!}
+            {!! Form::text('telefono', old('telefono'), ['class' => 'form-control']) !!}
+          </div>
         </div>
 
           <div class="form-row">
@@ -61,16 +64,23 @@ foreach($projectResponse->object()->projects as $project){
               {!! Form::label('subject', 'Oggetto') !!}
               {!! Form::text('subject', old('subject'), ['class' => 'form-control']) !!}
             </div>
+          </div>
 
-            <div class="form-group col-md">
-              {!! Form::label('referente', 'Referente per la problematica') !!}
-              {!! Form::text('referente', old('referente'), ['class' => 'form-control']) !!}
+          <div class="form-row">
+            @if($progettiCollection->count() > 1)
+              <div class="form-group col-md-4">
+                {!! Form::label('project_id', 'Progetto') !!}
+                {!! Form::select('project_id', $progettiCollection->pluck('name', 'id'), old('project_id'), ['class' => 'form-control', 'onchange' => 'load_custom_fields(this)']) !!}
+              </div>
+            @else
+            {!! Form::hidden('project_id', $progettiCollection->first()->id) !!}
+            @endif
+
+            <div class="form-group col-md-8">
+              <div class="form-row" id="custom_fields">
+              </div>
             </div>
 
-            <div class="form-group col-md">
-              {!! Form::label('telefono', 'Numero di telefono') !!}
-              {!! Form::text('telefono', old('telefono'), ['class' => 'form-control']) !!}
-            </div>
           </div>
 
           <div class="form-row">
@@ -110,3 +120,20 @@ foreach($projectResponse->object()->projects as $project){
 
 
 </x-app-layout>
+
+<script>
+$(document).ready(function(){
+  $.ajaxSetup({
+    headers: {
+      'X-CSRF-TOKEN': '{{csrf_token()}}'
+    }
+  });
+
+  load_custom_fields("[name='project_id']");
+});
+
+
+function load_custom_fields(select){
+  $('#custom_fields').load("{{ route('issue.load_custom_fields') }}?project_id="+$(select).val());
+}
+</script>

resources/views/issue/show.blade.php

@@ -8,6 +8,15 @@ $tempoImpiegatoRemota = Issue::getTempoImpiegato($issue->id, Config::getValue(Co
 ?>
 
 <style>
+.divData {
+  width: 100%;
+  font-weight: bold;
+  text-align: center;
+  background-color: #DCDCDC;
+  border-radius: 5px;
+  padding: 5px;
+  margin-bottom: 5px;
+}
 </style>
 
 <x-app-layout>
@@ -18,30 +27,30 @@ $tempoImpiegatoRemota = Issue::getTempoImpiegato($issue->id, Config::getValue(Co
   </x-slot>
 
   <div class="row justify-content-center mb-4">
-    <div class="col-xl-10 col-lg-12 col-md px-md-3 px-2">
+    <div class="col-xl-12 col-lg-12 col-md px-md-3 px-2">
       <div class="card">
         <div class="card-body">
 
           <div class="form-row">
-            <div class="form-group col-md">
+            <div class="form-group col-md border mr-2 p-2" >
               {!! Form::label('subject', 'Oggetto') !!}
               {!! $issue->subject !!}
             </div>
 
-            <div class="form-group col-md">
+            <div class="form-group col-md border mx-2 p-2">
               {!! Form::label('author', 'Autore') !!}
               {!! $author !!}
             </div>
 
-            <div class="form-group col-md">
+            <div class="form-group col-md border ml-2 p-2">
               {!! Form::label('created_on', 'Data') !!}
               {!! Carbon::parse($issue->created_on)->timezone(config('app.timezone'))->format('d/m/Y H:i') !!}
             </div>
           </div>
 
           <div class="form-row">
-            <div class="form-group col-md">
-              {!! Form::label('description', 'Descrizione') !!}
+            <div class="form-group col-md border p-2">
+              {!! Form::label('description', 'Descrizione della problematica') !!}
               {!! $issue->description !!}
             </div>
           </div>
@@ -54,12 +63,14 @@ $tempoImpiegatoRemota = Issue::getTempoImpiegato($issue->id, Config::getValue(Co
   <div class="row justify-content-center mb-4">
     <div class="col-xl-6 col-md px-md-3 px-2">
       <div class="card">
-        <div class="card-header">Cronologia</div>
+        <div class="card-header"><label>Interventi di assistenza</label></div>
         <div class="card-body">
           @foreach($issue->journals as $journal)
           @if($journal->notes != '' && !$journal->private_notes)
           <div class="mb-2">
-            <b>{{ Carbon::parse($journal->created_on)->timezone(config('app.timezone'))->format('d/m/Y H:i') }}</b><br>
+            <div class="divData">
+              <i class="fas fa-calendar-day"></i> {{ Carbon::parse($journal->created_on)->timezone(config('app.timezone'))->format('d/m/Y H:i') }}
+            </div>
             {!! $journal->notes !!}
           </div>
           @endif
@@ -70,12 +81,14 @@ $tempoImpiegatoRemota = Issue::getTempoImpiegato($issue->id, Config::getValue(Co
 
     <div class="col-xl-3 col-md px-md-3 px-2">
       <div class="card">
-        <div class="card-header">Tempo impiegato</div>
+        <div class="card-header"><label>Tempo impiegato</label></div>
         <div class="card-body">
           <?php
           $sum_ore_onsite = 0;
           ?>
-          <h4>On Site</h4>
+          <div class="divData">
+            On Site
+          </div>
           @if($tempoImpiegatoOnSite->count() == 0)
           <i>Nessun tempo registrato</i>
           @else
@@ -94,7 +107,10 @@ $tempoImpiegatoRemota = Issue::getTempoImpiegato($issue->id, Config::getValue(Co
           <b>Totale ore onsite: </b> {{ $sum_ore_onsite }}h
           @endif
 
-          <h4 class="mt-3">Remota</h4>
+          <div class="divData mt-3">
+            Remota
+          </div>
+
           <?php
           $sum_ore_remota = 0;
           ?>
@@ -122,15 +138,15 @@ $tempoImpiegatoRemota = Issue::getTempoImpiegato($issue->id, Config::getValue(Co
 
     <div class="col-xl-3 col-md px-md-3 px-2">
       <div class="card">
-        <div class="card-header">Allegati</div>
+        <div class="card-header"><label>Allegati</label></div>
         <div class="card-body">
           <ul>
-          @foreach($issue->attachments as $attachment)
-          <li>
-            <a href="{{ route('attachment.download', ['id' => $attachment->id]) }}?filename={{ $attachment->filename }}">{{ $attachment->filename }}</a>
-          </li>
-          @endforeach
-        </ul>
+            @foreach($issue->attachments as $attachment)
+            <li>
+              <a href="{{ route('attachment.download', ['id' => $attachment->id]) }}?filename={{ $attachment->filename }}">{{ $attachment->filename }}</a>
+            </li>
+            @endforeach
+          </ul>
         </div>
       </div>
     </div>

routes/web.php

@@ -36,6 +36,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
 
   Route::get('issue', [IssueController::class, 'index'])->name('issue.index');
   Route::get('issue/show', [IssueController::class, 'show'])->name('issue.show');
+  Route::get('issue/load_custom_fields', [IssueController::class, 'load_custom_fields'])->name('issue.load_custom_fields');
   Route::get('issue/nuovo', [IssueController::class, 'nuovo'])->name('issue.nuovo');
   Route::post('issue/crea', [IssueController::class, 'crea'])->name('issue.crea');
   Route::get('attachment/{id?}/download', [IssueController::class, 'download'])->name('attachment.download');