modifiche fabio

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/IssueController.php

@@ -24,18 +24,14 @@ 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');
 
-    // if($id == null){
-    //   $id = $request->issue_id;
-    // }
-
-    $response_issue = Http::get(session('azienda')->redmine_url.'/issues/'.$id.'.json?include=attachments,relations', [
+    $response_issue = Http::get(session('azienda')->redmine_url.'/issues/'.$request->issue_id.'.json?include=attachments,relations', [
       'key' => $redmineUser->api_key,
     ]);
 
-    $response_helpesk = Http::get(session('azienda')->redmine_url.'/helpdesk_tickets/'.$id.'.json', [
+    $response_helpesk = Http::get(session('azienda')->redmine_url.'/helpdesk_tickets/'.$request->issue_id.'.json', [
       'key' => $redmineUser->api_key,
     ]);
 
@@ -66,11 +62,20 @@ class IssueController extends Controller
     $redmineUser = session('redmine_user');
 
     // Issue details
-    $response_issue = Http::get(session('azienda')->redmine_url.'/issues/'.$id.'.json?include=attachments,relations', [
+    $response_issue = Http::get(session('azienda')->redmine_url.'/issues/'.$id.'.json?include=attachments,relations,custom_fields', [
       'key' => $redmineUser->api_key,
     ]);
     $issue = $response_issue->object()->issue;
 
+    // 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;
+      }
+    }
+
     // Activity
     $response = Http::get(session('azienda')->redmine_url.'/enumerations/time_entry_activities.json', [
       'key' => $redmineUser->api_key,
@@ -84,13 +89,6 @@ class IssueController extends Controller
 
     // issueStatus
     $issueStatus = Issue::getStati();
-    // $response = Http::get(session('azienda')->redmine_url.'/issue_statuses.json', [
-    //   'key' => $redmineUser->api_key,
-    // ]);
-    //
-    // foreach($response->object()->issue_statuses as $issue_status){
-    //   $issueStatus[$issue_status->id] = $issue_status->name;
-    // }
 
     // Altri tecnici
     $response = Http::get(session('azienda')->redmine_url.'/projects/'.$issue->project->id.'/memberships.json', [
@@ -127,13 +125,15 @@ class IssueController extends Controller
     $user = User::where('redmine_id', $redmineUser->id)->first();
 
 
+
     return view('issue.firma')->with([
       'issue' => $issue,
       'attivita' => $attivita,
       'issueStatus' => $issueStatus,
       'altriTecnici' => $altriTecnici,
       'altreSegnalazioni' => $collectionAltreSegnalazioni,
-      'user' => $user
+      'user' => $user,
+      'sedeCliente' => $sedeCliente
     ]);
   }
 
@@ -205,7 +205,8 @@ class IssueController extends Controller
       'fine' => $fine,
       'persona_riferimento' => $request->persona_riferimento,
       'cliente' => $cliente,
-      'user' => $user
+      'user' => $user,
+      'sedeCliente' => $request->sedeCliente
     ]);
 
     $folder_name = Storage::disk('temp')->getDriver()->getAdapter()->getPathPrefix();

resources/views/home.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/firma.blade.php

@@ -70,9 +70,17 @@ use Carbon\Carbon;
 
           <div class="form-row">
             <div class="form-group col-md">
-              {!! Form::label('persona_riferimento', 'Persona di riferimento') !!}
+              {!! Form::label('persona_riferimento', 'Referente cliente') !!}
               {!! Form::text('persona_riferimento', null, ['class' => 'form-control']) !!}
             </div>
+
+            @if($sedeCliente != null)
+            <div class="form-group col-md-4">
+              {!! Form::label('sedeCliente', 'Sede intervento') !!}
+              {!! $sedeCliente !!}
+            </div>
+            @endif
+            {!! Form::hidden('sedeCliente', $sedeCliente) !!}
           </div>
 
           <div class="form-row">
@@ -197,11 +205,15 @@ use Carbon\Carbon;
             <div class="form-group col-md-6">
               {!! Form::label('firma_tecnico', 'Firma tecnico') !!}
 
+              @if($user->firma != null)
+
               @if(config('database.default') == 'mysql')
               <img src="data:image/png;base64,{!! base64_decode($user->firma) !!}" />
               @else
               <img src="data:image/png;base64,{!! stream_get_contents($user->firma) !!}" />
               @endif
+
+              @endif
             </div>
 
             <div class="form-group col-md-6">

resources/views/issue/index.blade.php

@@ -11,7 +11,7 @@
   <div class="row justify-content-center mb-4">
     <div class="col-xl-10 col-lg-10">
       <div class="card">
-        <div class="card-body">          
+        <div class="card-body">
 
           {{ $dataTable_issues->table() }}
 
@@ -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/pdf.blade.php

@@ -29,9 +29,13 @@
         </div>
         <div class="box_dx">
           <h3 style="font-weight: bold;">Cliente</h3>
-          {{ $cliente }}<br>
+          {{ $cliente }}
           @if($persona_riferimento != null && $persona_riferimento != '')
-          Persona di riferimento: {{ $persona_riferimento }}
+          <br>Referente cliente: {{ $persona_riferimento }}
+          @endif
+
+          @if($sedeCliente != null && $sedeCliente != '')
+          <br>Sede intervento: {{ $sedeCliente }}
           @endif
         </div>
       </div>
@@ -100,9 +104,6 @@
           <img src="data:image/png;base64,{!! stream_get_contents($user->firma) !!}" style="width: 80%"/>
           @endif
 
-          @else
-          <!-- Firma inserita durante la compilazione -->
-          <img src="data:image/png;base64,{!! base64_decode($firmaTecnico) !!}" style="width: 80%"/>
           @endif
 
         </div>

resources/views/issue/success.blade.php

@@ -12,7 +12,7 @@
     <div class="col-xl-6 col-lg-6">
       <div class="card">
         <div class="card-body" style="text-align: center">
-          <h2 style="text-align: center">Issue #{{ $issue_id }} aggiornato correttamente</h2><br>
+          <h2 style="text-align: center">Issue #{{ $issue_id }} aggiornata correttamente</h2><br>
           <a href="{{ Storage::disk('temp')->url('issue_'.$issue_id.'.pdf') }}" class="btn btn-primary">Scarica rapporto firmato</a><br><br>
           <a href="{{ route('issue.index') }}" class="btn btn-primary">Torna alla lista degli issue</a>
         </div>

routes/web.php

@@ -32,7 +32,7 @@ Route::post('logout', [LoginController::class, 'logout'])->name('logout');
 Route::middleware(['redmine_auth'])->group(function () {
   Route::get('home', [HomeController::class, 'home'])->name('home');
   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/{id}/firma', [IssueController::class, 'firma'])->name('issue.firma');
   Route::post('issue/firma_rapporto', [IssueController::class, 'firma_rapporto'])->name('issue.firma_rapporto');
   Route::get('issue/success', [IssueController::class, 'success'])->name('issue.success');

storage/fonts/encode_sans_condensed_normal_be9c7c9139c8386fff63b1a695a5a1f6.ufm.php

@@ -0,0 +1,483 @@
+<?php return array (
+  'codeToName' => 
+  array (
+    0 => 'NULL',
+    13 => 'CR',
+    32 => 'space',
+    33 => 'exclam',
+    34 => 'quotedbl',
+    35 => 'numbersign',
+    36 => 'dollar',
+    37 => 'percent',
+    38 => 'ampersand',
+    39 => 'quotesingle',
+    40 => 'parenleft',
+    41 => 'parenright',
+    42 => 'asterisk',
+    43 => 'plus',
+    44 => 'comma',
+    45 => 'hyphen',
+    46 => 'period',
+    47 => 'slash',
+    48 => 'zero',
+    49 => 'one',
+    50 => 'two',
+    51 => 'three',
+    52 => 'four',
+    53 => 'five',
+    54 => 'six',
+    55 => 'seven',
+    56 => 'eight',
+    57 => 'nine',
+    58 => 'colon',
+    59 => 'semicolon',
+    60 => 'less',
+    61 => 'equal',
+    62 => 'greater',
+    63 => 'question',
+    64 => 'at',
+    65 => 'A',
+    66 => 'B',
+    67 => 'C',
+    68 => 'D',
+    69 => 'E',
+    70 => 'F',
+    71 => 'G',
+    72 => 'H',
+    73 => 'I',
+    74 => 'J',
+    75 => 'K',
+    76 => 'L',
+    77 => 'M',
+    78 => 'N',
+    79 => 'O',
+    80 => 'P',
+    81 => 'Q',
+    82 => 'R',
+    83 => 'S',
+    84 => 'T',
+    85 => 'U',
+    86 => 'V',
+    87 => 'W',
+    88 => 'X',
+    89 => 'Y',
+    90 => 'Z',
+    91 => 'bracketleft',
+    92 => 'backslash',
+    93 => 'bracketright',
+    94 => 'asciicircum',
+    95 => 'underscore',
+    96 => 'grave',
+    97 => 'a',
+    98 => 'b',
+    99 => 'c',
+    100 => 'd',
+    101 => 'e',
+    102 => 'f',
+    103 => 'g',
+    104 => 'h',
+    105 => 'i',
+    106 => 'j',
+    107 => 'k',
+    108 => 'l',
+    109 => 'm',
+    110 => 'n',
+    111 => 'o',
+    112 => 'p',
+    113 => 'q',
+    114 => 'r',
+    115 => 's',
+    116 => 't',
+    117 => 'u',
+    118 => 'v',
+    119 => 'w',
+    120 => 'x',
+    121 => 'y',
+    122 => 'z',
+    123 => 'braceleft',
+    124 => 'bar',
+    125 => 'braceright',
+    126 => 'asciitilde',
+    160 => 'uni00A0',
+    161 => 'exclamdown',
+    162 => 'cent',
+    163 => 'sterling',
+    164 => 'currency',
+    165 => 'yen',
+    166 => 'brokenbar',
+    167 => 'section',
+    168 => 'dieresis',
+    169 => 'copyright',
+    170 => 'ordfeminine',
+    171 => 'guillemotleft',
+    172 => 'logicalnot',
+    173 => 'uni00AD',
+    174 => 'registered',
+    175 => 'macron',
+    176 => 'degree',
+    177 => 'plusminus',
+    178 => 'uni00B2',
+    179 => 'uni00B3',
+    180 => 'acute',
+    181 => 'uni00B5',
+    182 => 'paragraph',
+    183 => 'periodcentered',
+    184 => 'cedilla',
+    185 => 'uni00B9',
+    186 => 'ordmasculine',
+    187 => 'guillemotright',
+    188 => 'onequarter',
+    189 => 'onehalf',
+    190 => 'threequarters',
+    191 => 'questiondown',
+    192 => 'Agrave',
+    193 => 'Aacute',
+    194 => 'Acircumflex',
+    195 => 'Atilde',
+    196 => 'Adieresis',
+    197 => 'Aring',
+    198 => 'AE',
+    199 => 'Ccedilla',
+    200 => 'Egrave',
+    201 => 'Eacute',
+    202 => 'Ecircumflex',
+    203 => 'Edieresis',
+    204 => 'Igrave',
+    205 => 'Iacute',
+    206 => 'Icircumflex',
+    207 => 'Idieresis',
+    208 => 'Eth',
+    209 => 'Ntilde',
+    210 => 'Ograve',
+    211 => 'Oacute',
+    212 => 'Ocircumflex',
+    213 => 'Otilde',
+    214 => 'Odieresis',
+    215 => 'multiply',
+    216 => 'Oslash',
+    217 => 'Ugrave',
+    218 => 'Uacute',
+    219 => 'Ucircumflex',
+    220 => 'Udieresis',
+    221 => 'Yacute',
+    222 => 'Thorn',
+    223 => 'germandbls',
+    224 => 'agrave',
+    225 => 'aacute',
+    226 => 'acircumflex',
+    227 => 'atilde',
+    228 => 'adieresis',
+    229 => 'aring',
+    230 => 'ae',
+    231 => 'ccedilla',
+    232 => 'egrave',
+    233 => 'eacute',
+    234 => 'ecircumflex',
+    235 => 'edieresis',
+    236 => 'igrave',
+    237 => 'iacute',
+    238 => 'icircumflex',
+    239 => 'idieresis',
+    240 => 'eth',
+    241 => 'ntilde',
+    242 => 'ograve',
+    243 => 'oacute',
+    244 => 'ocircumflex',
+    245 => 'otilde',
+    246 => 'odieresis',
+    247 => 'divide',
+    248 => 'oslash',
+    249 => 'ugrave',
+    250 => 'uacute',
+    251 => 'ucircumflex',
+    252 => 'udieresis',
+    253 => 'yacute',
+    254 => 'thorn',
+    255 => 'ydieresis',
+    305 => 'dotlessi',
+    338 => 'OE',
+    339 => 'oe',
+    699 => 'uni02BB',
+    700 => 'uni02BC',
+    710 => 'circumflex',
+    730 => 'ring',
+    732 => 'tilde',
+    8201 => 'uni2009',
+    8203 => 'uni200B',
+    8211 => 'endash',
+    8212 => 'emdash',
+    8216 => 'quoteleft',
+    8217 => 'quoteright',
+    8218 => 'quotesinglbase',
+    8220 => 'quotedblleft',
+    8221 => 'quotedblright',
+    8222 => 'quotedblbase',
+    8226 => 'bullet',
+    8230 => 'ellipsis',
+    8242 => 'minute',
+    8243 => 'second',
+    8249 => 'guilsinglleft',
+    8250 => 'guilsinglright',
+    8260 => 'fraction',
+    8308 => 'uni2074',
+    8364 => 'Euro',
+    8482 => 'trademark',
+    8593 => 'arrowup',
+    8595 => 'arrowdown',
+    8722 => 'minus',
+    8725 => 'uni2215',
+  ),
+  'isUnicode' => true,
+  'EncodingScheme' => 'FontSpecific',
+  'FontName' => 'Encode Sans Condensed',
+  'FullName' => 'Encode Sans Condensed Regular',
+  'Version' => 'Version 2.000',
+  'PostScriptName' => 'EncodeSansCondensed-Regular',
+  'Weight' => 'Medium',
+  'ItalicAngle' => '0',
+  'IsFixedPitch' => 'false',
+  'UnderlineThickness' => '25',
+  'UnderlinePosition' => '-38',
+  'FontHeightOffset' => '0',
+  'Ascender' => '1030',
+  'Descender' => '-220',
+  'FontBBox' => 
+  array (
+    0 => '-387',
+    1 => '-233',
+    2 => '1150',
+    3 => '1075',
+  ),
+  'StartCharMetrics' => '316',
+  'C' => 
+  array (
+    0 => 0.0,
+    13 => 211.0,
+    32 => 211.0,
+    33 => 225.0,
+    34 => 337.0,
+    35 => 527.0,
+    36 => 458.0,
+    37 => 836.0,
+    38 => 658.0,
+    39 => 186.0,
+    40 => 290.0,
+    41 => 290.0,
+    42 => 439.0,
+    43 => 511.0,
+    44 => 205.0,
+    45 => 350.0,
+    46 => 205.0,
+    47 => 253.0,
+    48 => 543.0,
+    49 => 299.0,
+    50 => 426.0,
+    51 => 446.0,
+    52 => 521.0,
+    53 => 448.0,
+    54 => 504.0,
+    55 => 412.0,
+    56 => 543.0,
+    57 => 504.0,
+    58 => 205.0,
+    59 => 205.0,
+    60 => 511.0,
+    61 => 511.0,
+    62 => 511.0,
+    63 => 400.0,
+    64 => 831.0,
+    65 => 588.0,
+    66 => 565.0,
+    67 => 488.0,
+    68 => 601.0,
+    69 => 497.0,
+    70 => 476.0,
+    71 => 576.0,
+    72 => 630.0,
+    73 => 221.0,
+    74 => 221.0,
+    75 => 546.0,
+    76 => 465.0,
+    77 => 787.0,
+    78 => 642.0,
+    79 => 613.0,
+    80 => 549.0,
+    81 => 613.0,
+    82 => 581.0,
+    83 => 458.0,
+    84 => 517.0,
+    85 => 618.0,
+    86 => 573.0,
+    87 => 920.0,
+    88 => 567.0,
+    89 => 517.0,
+    90 => 497.0,
+    91 => 290.0,
+    92 => 253.0,
+    93 => 290.0,
+    94 => 527.0,
+    95 => 483.0,
+    96 => 453.0,
+    97 => 447.0,
+    98 => 482.0,
+    99 => 370.0,
+    100 => 482.0,
+    101 => 444.0,
+    102 => 305.0,
+    103 => 482.0,
+    104 => 487.0,
+    105 => 203.0,
+    106 => 203.0,
+    107 => 450.0,
+    108 => 203.0,
+    109 => 749.0,
+    110 => 487.0,
+    111 => 477.0,
+    112 => 482.0,
+    113 => 482.0,
+    114 => 311.0,
+    115 => 379.0,
+    116 => 322.0,
+    117 => 483.0,
+    118 => 455.0,
+    119 => 747.0,
+    120 => 428.0,
+    121 => 455.0,
+    122 => 389.0,
+    123 => 310.0,
+    124 => 214.0,
+    125 => 310.0,
+    126 => 511.0,
+    160 => 211.0,
+    161 => 225.0,
+    162 => 368.0,
+    163 => 545.0,
+    164 => 527.0,
+    165 => 538.0,
+    166 => 214.0,
+    167 => 430.0,
+    168 => 453.0,
+    169 => 832.0,
+    170 => 374.0,
+    171 => 416.0,
+    172 => 620.0,
+    173 => 350.0,
+    174 => 727.0,
+    175 => 453.0,
+    176 => 456.0,
+    177 => 511.0,
+    178 => 359.0,
+    179 => 359.0,
+    180 => 453.0,
+    181 => 483.0,
+    182 => 549.0,
+    183 => 205.0,
+    184 => 453.0,
+    185 => 359.0,
+    186 => 398.0,
+    187 => 416.0,
+    188 => 831.0,
+    189 => 831.0,
+    190 => 831.0,
+    191 => 400.0,
+    192 => 588.0,
+    193 => 588.0,
+    194 => 588.0,
+    195 => 588.0,
+    196 => 588.0,
+    197 => 588.0,
+    198 => 812.0,
+    199 => 488.0,
+    200 => 497.0,
+    201 => 497.0,
+    202 => 497.0,
+    203 => 497.0,
+    204 => 221.0,
+    205 => 221.0,
+    206 => 221.0,
+    207 => 221.0,
+    208 => 601.0,
+    209 => 642.0,
+    210 => 613.0,
+    211 => 613.0,
+    212 => 613.0,
+    213 => 613.0,
+    214 => 613.0,
+    215 => 482.0,
+    216 => 613.0,
+    217 => 618.0,
+    218 => 618.0,
+    219 => 618.0,
+    220 => 618.0,
+    221 => 517.0,
+    222 => 554.0,
+    223 => 604.0,
+    224 => 447.0,
+    225 => 447.0,
+    226 => 447.0,
+    227 => 447.0,
+    228 => 447.0,
+    229 => 447.0,
+    230 => 712.0,
+    231 => 370.0,
+    232 => 444.0,
+    233 => 444.0,
+    234 => 444.0,
+    235 => 444.0,
+    236 => 203.0,
+    237 => 203.0,
+    238 => 203.0,
+    239 => 203.0,
+    240 => 477.0,
+    241 => 487.0,
+    242 => 477.0,
+    243 => 477.0,
+    244 => 477.0,
+    245 => 477.0,
+    246 => 477.0,
+    247 => 511.0,
+    248 => 477.0,
+    249 => 483.0,
+    250 => 483.0,
+    251 => 483.0,
+    252 => 483.0,
+    253 => 455.0,
+    254 => 482.0,
+    255 => 455.0,
+    305 => 203.0,
+    338 => 856.0,
+    339 => 760.0,
+    699 => 453.0,
+    700 => 453.0,
+    710 => 453.0,
+    730 => 453.0,
+    732 => 453.0,
+    8201 => 200.0,
+    8203 => 0.0,
+    8211 => 400.0,
+    8212 => 800.0,
+    8216 => 205.0,
+    8217 => 205.0,
+    8218 => 205.0,
+    8220 => 366.0,
+    8221 => 366.0,
+    8222 => 366.0,
+    8226 => 334.0,
+    8230 => 593.0,
+    8242 => 186.0,
+    8243 => 337.0,
+    8249 => 248.0,
+    8250 => 248.0,
+    8260 => 114.0,
+    8308 => 359.0,
+    8364 => 552.0,
+    8482 => 908.0,
+    8593 => 642.0,
+    8595 => 642.0,
+    8722 => 511.0,
+    8725 => 253.0,
+  ),
+  'CIDtoGID_Compressed' => true,
+  'CIDtoGID' => 'eJzt0NXOGFUUhuF3cKdOCxQI7laKFYK7O4FAcHfXM1zvBHd3LgB3dzvD7Q/pQdMUaKDwk/A8yZo9s2ZmzTe7od8z3+/emdX8PdyTPdrnw3zD+J7qpV7unr7pwV7rsZ7pqq7umq7tuq7vhm7spm7ugZ7up37oxx4fxrVAS7RkSze2SS3T5Ka0Qiu2Uiu3Squ1Xhu0YRu1cdPavC3ashlt3Qvd24vD8j07bN427dKu7d6e7df+HdCBHd4RHdlRHd2xndrpndGZnd05XdhFXdwlXd5zw7I93y9z9Yd/7KMe6dO+7LO+GpYbJg6bDZO6ojdGtvX1YZlhi2FKP3drtw2bDMMwofuG6d3Slb3ZXd3Z3T3RIi3YQi3Wwi3a4i3VxMY1vglNbdmWa/nGtGprtXprtE5r9l1rt1mbNL1N26r1O6sd2rbt2qnt27Gd261926u926fDOrhDOrQ9OqYTO67jO7kT+r6TuqBzO6/zu7TTumwe7MCfOehvT1i3U+ZBDviPGKYNG8+hu+lcvr3lSM2Yt4kAAAAAAAAAAAAAAAAAAPjP+nikPpmt92qvzDx7vw/6cGR9t/d6Z2bv/pnrQ3MeOEwdVpjl8q3ensNDd/ylrHPv9n94/uy++Je/N4qGyaOd4J80jBmpsaOdYlR9+9vx61FOAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8T/wKKZVdkw==',
+  '_version_' => 6,
+);