bug

app/DataTables/IssueDataTable.php

@@ -36,7 +36,7 @@ class IssueDataTable extends DataTable
       }
     })
     ->addColumn('action', function($entity){
-      $button = "<a class='btn btn-primary' href='".route('issue.show', ['id' => $entity->id])."'><i class='fas fa-chevron-right'></i></a>";
+      $button = "<a class='btn btn-primary' href='".route('issue.show', ['issue_id' => $entity->id])."'><i class='fas fa-chevron-right'></i></a>";
       return $button;
       return view('issue.menu', ['entity' => $entity]);
     });

app/Http/Controllers/ConfigController.php

@@ -30,36 +30,40 @@ class ConfigController extends Controller
 
     foreach($input['key'] as $key => $value){
       $config = Config::find($value);
-      switch ($config->type) {
-        case 'file':
-        $file = $request->file('value');
-        if($file != null && array_key_exists($key, $file)){
-          $filename = $file[$key]->storeAs('public', $file[$key]->getClientOriginalName());
-          $config->value = $filename;
-          $index_file++;
-        }
-        break;
+      try{
+        switch ($config->type) {
+          case 'file':
+          $file = $request->file('value');
+          if($file != null && array_key_exists($key, $file)){
+            $filename = $file[$key]->storeAs('public', $file[$key]->getClientOriginalName());
+            $config->value = $filename;
+            $index_file++;
+          }
+          break;
 
-        case 'array_status':
-        $config->value = json_encode($request->value[$key]);
-        break;
+          case 'array_status':
+          $config->value = json_encode($request->value[$key]);
+          break;
 
-        case 'users':
-        $config->value = json_encode($request->value[$key]);
-        break;
+          case 'users':
+          $config->value = json_encode($request->value[$key]);
+          break;
 
-        case 'password':
-        if($request->value[$key] != null && $request->value[$key] != ''){
+          case 'password':
+          if($request->value[$key] != null && $request->value[$key] != ''){
             $config->value = $request->value[$key];
+          }
+          break;
+
+          default:
+          $config->value = $request->value[$key];
+          // $index++;
+          break;
         }
-        break;
+        $config->save();
+      }catch(\Exception $e){
 
-        default:
-        $config->value = $request->value[$key];
-        // $index++;
-        break;
       }
-      $config->save();
     }
 
     Session::flash('flash_message', 'Configurazione aggiornata');

app/Http/Controllers/IssueController.php

@@ -39,17 +39,17 @@ class IssueController extends Controller
     return $dataTable->with(['issues' => $collection])->render('issue.index');
   }
 
-  public function show($id = null, Request $request){
+  public function show(Request $request){
     $redmineUser = session('redmine_user');
 
 
-    $response_issue = Http::get(config('redmine.url').'/issues/'.$id.'.json?include=attachments,relations,journals', [
+    $response_issue = Http::get(config('redmine.url').'/issues/'.$request->issue_id.'.json?include=attachments,relations,journals', [
       'key' => $redmineUser->api_key,
       'include' => 'journals,attachments,relations'
     ]);
 
 
-    $response_helpesk = Http::get(config('redmine.url').'/helpdesk_tickets/'.$id.'.json', [
+    $response_helpesk = Http::get(config('redmine.url').'/helpdesk_tickets/'.$request->issue_id.'.json', [
       'key' => $redmineUser->api_key,
     ]);
 
@@ -103,7 +103,7 @@ class IssueController extends Controller
       'telefono' => 'required|string|max:255',
       'description' => 'required',
       'accetto_condizioni' =>'accepted',
-      'allegato' => 'size:5000'
+      'allegato' => 'size:10000'
     ];
 
     $request->validate($rules, $this->messages);

app/Http/Controllers/UserController.php

@@ -106,19 +106,36 @@ class UserController extends Controller
 
   public function load_progetti(Request $request){
     $redmineUser = session('redmine_user');
-    $collection = new Collection();
+    $user = User::find($request->user_id);
+
+    $progettiUser = new Collection;
+    $progetti = new Collection;
+
+    // Lista di tutti i progetti
+    $projectResponseUser = Http::get(config('redmine.url').'/projects.json', [
+      'key' => $redmineUser->api_key
+    ]);
 
+    // Lista di 30 progetti filtrati per ricerca
     $projectResponse = Http::get(config('redmine.url').'/projects.json', [
       'key' => $redmineUser->api_key,
       'name' => '~'.($request->has('filter')?$request->filter:''),
-      'limit' => 20
+      'limit' => 30
     ]);
 
+    foreach($projectResponseUser->object()->projects as $project){
+      if(in_array($project->id, json_decode($user->progetti))){
+        $progettiUser->push($project);
+      }
+    }
+
     foreach($projectResponse->object()->projects as $project){
-      $collection->push($project);
+      if(!in_array($project->id, json_decode($user->progetti))){
+        $progetti->push($project);
+      }
     }
 
-    return view('user.progetti')->with(['user' => User::find($request->user_id), 'progetti' => $collection]);
+    return view('user.progetti')->with(['user' => $user, 'progetti' => $progetti, 'progettiUser' => $progettiUser]);
   }
 
   public function update_progetti(Request $request){

app/Models/Config.php

@@ -5,13 +5,17 @@ use Storage;
 class Config extends \App\Models\AbstractModels\AbstractConfig
 {
   const STATI_SEGNALAZIONI_VALIDE = 'stati_segnalazioni_valide';
-  const ATTIVITA_ON_SITE = 12;
-  const ATTIVITA_REMOTA = 11;
+  const ATTIVITA_ON_SITE = 'attivita_onsite';
+  const ATTIVITA_REMOTA = 'attivita_remota';
+  const CAMPO_FATTURARE = 'campo_fatturare';
 
   public static function getConfig(){
     $config = [];
     $config['Generale'] = [
-      ['key' => self::STATI_SEGNALAZIONI_VALIDE, 'value' => null, 'display_name' => 'Stati segnalazioni da mostrare al cliente', 'type' => 'array_status'],
+      ['key' => self::STATI_SEGNALAZIONI_VALIDE, 'value' => null, 'display_name' => 'Stati segnalazioni da mostrare al cliente', 'type' => 'array_status', 'order' => 10],
+      ['key' => self::ATTIVITA_ON_SITE, 'value' => null, 'display_name' => 'Tipo attività on site', 'type' => 'activity', 'order' => 20],
+      ['key' => self::ATTIVITA_REMOTA, 'value' => null, 'display_name' => 'Tipo attività remota', 'type' => 'activity', 'order' => 30],
+      ['key' => self::CAMPO_FATTURARE, 'value' => null, 'display_name' => 'Campo "Fatturare?" (impostato a "Si")', 'type' => 'custom_fields', 'order' => 30],
     ];
 
     return $config;

app/Models/Issue.php

@@ -56,7 +56,7 @@ class Issue{
     $issueResponse = Http::get(config('redmine.url').'/time_entries.json', [
       'key' => $redmineUser->api_key,
       'issue_id' => $issue_id,
-      'cf_2' => 'Si', // Custom fields "fatturare"
+      'cf_'.Config::getValue(Config::CAMPO_FATTURARE) => 'Si', // Custom fields "fatturare"
       'activity_id' => $attivita
 
     ]);
@@ -87,4 +87,36 @@ class Issue{
     return $issueStatus;
   }
 
+  public static function getAttivita(){
+    $redmineUser = session('redmine_user');
+
+    $response = Http::get(config('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;
+  }
+
+  public static function getCustomFields(){
+    $redmineUser = session('redmine_user');
+
+    $response = Http::get(config('redmine.url').'/custom_fields.json', [
+      'key' => $redmineUser->api_key,
+      'customized_type' => 'time_entry'
+    ]);
+
+    $custom = array();
+    foreach($response->object()->custom_fields as $custom_field){
+      $custom[$custom_field->id] = $custom_field->name;
+    }
+
+    return $custom;
+  }
+
 }

database/seeders/ConfigSeeder.php

@@ -23,8 +23,8 @@ class ConfigSeeder extends Seeder
           $config->order = $order;
           $config->group = $key;
           $config->save();
-          $order++;
         }
+        $order++;
       }
     }
   }

resources/views/config/index.blade.php

@@ -68,14 +68,12 @@ thead select{
               ?>
               @break
 
-              @case('array_attivita')
-              <br>
-              <?php
-              $checked = json_decode($config->value);
-              foreach(Issue::getAttivita() as $attivita_id => $attivita_label){
-                echo Form::checkbox('value['.$config->key.'][]', $attivita_id, $checked!=null?in_array($attivita_id, $checked):false, [])." ".$attivita_label."<br>";
-              }
-              ?>
+              @case('activity')
+              {!! Form::select('value['.$config->key.']', Issue::getAttivita(), $config->value, ['class' => 'form-control']) !!}
+              @break
+
+              @case('custom_fields')
+              {!! Form::select('value['.$config->key.']', Issue::getCustomFields(), $config->value, ['class' => 'form-control']) !!}
               @break
 
               @case('file')

resources/views/issue/index.blade.php

@@ -37,7 +37,7 @@ $(document).ready(function(){
   $("#dataTable_issues").attr('width', '100%');
 
   $("#dataTable_issues").on('dblclick', 'tbody td', function (e) {
-  window.location = "{{ route('issue.show') }}?issue_id="+$(this).attr('id');
+    window.location = "{{ route('issue.show') }}?issue_id="+$(this).closest('tr').attr('id');
   });
 });
 </script>

resources/views/issue/menu.blade.php

@@ -1,11 +0,0 @@
-<div class="dropdown">
-  <a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-    <i class="fas fa-bars"></i>
-  </a>
-
-  <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
-    <a class="dropdown-item" href="{{ route('issue.show', ['id' => $entity->id]) }}"><i class="far fa-eye"></i>Apri</a>
-    <a class="dropdown-item" href="#" onclick=""><i class="fas fa-signature"></i>Firma rapportino</a>
-
-  </div>
-</div>

resources/views/issue/nuovo.blade.php

@@ -82,7 +82,7 @@ foreach($projectResponse->object()->projects as $project){
 
           <div class="form-row">
             <div class="form-group col-md">
-              {!! Form::label('allegato', 'Allegato') !!}
+              {!! Form::label('allegato', 'Allegato (max. 10Mb)') !!}
               {!! Form::file('allegato', ['class' => 'form-control']) !!}
             </div>
           </div>

resources/views/issue/show.blade.php

@@ -3,8 +3,8 @@ use App\Models\Issue;
 use App\Models\Config;
 use Carbon\Carbon;
 
-$tempoImpiegatoOnSite = Issue::getTempoImpiegato($issue->id, Config::ATTIVITA_ON_SITE);
-$tempoImpiegatoRemota = Issue::getTempoImpiegato($issue->id, Config::ATTIVITA_REMOTA);
+$tempoImpiegatoOnSite = Issue::getTempoImpiegato($issue->id, Config::getValue(Config::ATTIVITA_ON_SITE));
+$tempoImpiegatoRemota = Issue::getTempoImpiegato($issue->id, Config::getValue(Config::ATTIVITA_REMOTA));
 ?>
 
 <style>
@@ -72,14 +72,15 @@ $tempoImpiegatoRemota = Issue::getTempoImpiegato($issue->id, Config::ATTIVITA_RE
       <div class="card">
         <div class="card-header">Tempo impiegato</div>
         <div class="card-body">
+          <?php
+          $sum_ore_onsite = 0;
+          ?>
           <h4>On Site</h4>
           @if($tempoImpiegatoOnSite->count() == 0)
           <i>Nessun tempo registrato</i>
           @else
 
-          <?php
-          $sum_ore_onsite = 0;
-          ?>
+
           <ul>
             @foreach($tempoImpiegatoOnSite as $tempo)
             <li style="list-style-type: disc; margin: unset;">
@@ -94,13 +95,14 @@ $tempoImpiegatoRemota = Issue::getTempoImpiegato($issue->id, Config::ATTIVITA_RE
           @endif
 
           <h4 class="mt-3">Remota</h4>
+          <?php
+          $sum_ore_remota = 0;
+          ?>
           @if($tempoImpiegatoRemota->count() == 0)
           <i>Nessun tempo registrato</i>
           @else
 
-          <?php
-          $sum_ore_remota = 0;
-          ?>
+
 
           <ul>
             @foreach($tempoImpiegatoRemota as $tempo)

resources/views/user/progetti.blade.php

@@ -14,10 +14,20 @@ $checked = json_decode($user->progetti);
     {!! Form::open(['method' => 'POST', 'route' => ['user.progetti']]) !!}
     {!! Form::hidden('user_id', $user->id) !!}
 
+    <!-- Prima i progetti con flag -->
+
+    @foreach($progettiUser as $progetto)
+    <div class="form-row">
+      <div class="form-group col">
+        {!! Form::checkbox('progetto[]', $progetto->id, true, ['class' => '']) !!} {{ $progetto->name }}
+      </div>
+    </div>
+    @endforeach
+
     @foreach($progetti as $progetto)
     <div class="form-row">
       <div class="form-group col">
-        {!! Form::checkbox('progetto[]', $progetto->id, $checked!=null?in_array($progetto->id, $checked):false, ['class' => '']) !!} {{ $progetto->name }}
+        {!! Form::checkbox('progetto[]', $progetto->id, false, ['class' => '']) !!} {{ $progetto->name }}
       </div>
     </div>
     @endforeach

resources/views/user/roles.blade.php

@@ -19,18 +19,6 @@ use App\Models\Role;
           @endforeach
         </ul>
 
-        <!-- <h2 style="margin-top: 40px;">Permessi diretti assegnati all'utente</h2>
-        <hr>
-
-        @foreach(Permission::select('permissions.*')->groupBy('group')->orderBy('group', 'ASC')->get() as $group)
-        <h4>{{ $group->group }}</h4>
-        <ul style="list-style-type:none">
-          @foreach(Permission::where('group', $group->group)->orderBy('name', 'ASC')->get() as $permission)
-          <li>{!! Form::checkbox('permesso[]', $permission->id, $user->hasDirectPermission($permission->name), ['class' => '']) !!} {{ $permission->display_name }}</li>
-          @endforeach
-        </ul>
-        @endforeach -->
-
         {!! Form::submit('Salva', ['class' => 'btn btn-primary form-control']) !!}
         {!! Form::close() !!}
 

routes/web.php

@@ -35,7 +35,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
   Route::post('user/updateRole', [UserController::class, 'updateRole'])->name('user.updateRole');
 
   Route::get('issue', [IssueController::class, 'index'])->name('issue.index');
-  Route::get('issue/{id?}/show', [IssueController::class, 'show'])->name('issue.show');
+  Route::get('issue/show', [IssueController::class, 'show'])->name('issue.show');
   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');