Browse Source

Ore viaggio; descrizione precompilata

Roberto Santini 2 years ago
parent
commit
e5e677e2d8
2 changed files with 22 additions and 4 deletions
  1. 16
    2
      app/Http/Controllers/IssueController.php
  2. 6
    2
      resources/views/issue/firma.blade.php

+ 16
- 2
app/Http/Controllers/IssueController.php View File

65
     // Issue details
65
     // Issue details
66
     $response_issue = Http::get(session('azienda')->redmine_url.'/issues/'.$id.'.json?include=attachments,relations,custom_fields', [
66
     $response_issue = Http::get(session('azienda')->redmine_url.'/issues/'.$id.'.json?include=attachments,relations,custom_fields', [
67
       'key' => $redmineUser->api_key,
67
       'key' => $redmineUser->api_key,
68
+      'include' => 'journals'
68
     ]);
69
     ]);
69
     $issue = $response_issue->object()->issue;
70
     $issue = $response_issue->object()->issue;
70
 
71
 
121
 
122
 
122
     $user = User::where('redmine_id', $redmineUser->id)->first();
123
     $user = User::where('redmine_id', $redmineUser->id)->first();
123
 
124
 
125
+    // Ultima nota come descrizione
126
+    $descrizione = "";
127
+    try{
128
+      foreach($issue->journals as $journal){
129
+        if($journal->notes != '' && !$journal->private_notes){
130
+          $descrizione = $journal->notes;
131
+        }
132
+      }
133
+    }catch(\Exception $e){
134
+    }catch(\Error $e){
135
+    }
136
+
124
 
137
 
125
 
138
 
126
     return view('issue.firma')->with([
139
     return view('issue.firma')->with([
130
       'altriTecnici' => $altriTecnici,
143
       'altriTecnici' => $altriTecnici,
131
       'altreSegnalazioni' => $collectionAltreSegnalazioni,
144
       'altreSegnalazioni' => $collectionAltreSegnalazioni,
132
       'user' => $user,
145
       'user' => $user,
133
-      'sedeCliente' => $sedeCliente
146
+      'sedeCliente' => $sedeCliente,
147
+      'descrizione' => $descrizione
134
     ]);
148
     ]);
135
   }
149
   }
136
 
150
 
353
             'issue_id' => $request->issue_id,
367
             'issue_id' => $request->issue_id,
354
             'spent_on' => $dataIntervento->toDateString(),
368
             'spent_on' => $dataIntervento->toDateString(),
355
             'hours' => $request->ore_viaggio,
369
             'hours' => $request->ore_viaggio,
356
-            'comments' => '',
370
+            'comments' => 'Viaggio',
357
             'activity_id' => Config::getValue(Config::ATTIVITA_VIAGGIO),
371
             'activity_id' => Config::getValue(Config::ATTIVITA_VIAGGIO),
358
             'user_id' => $key,
372
             'user_id' => $key,
359
             'custom_fields' => [
373
             'custom_fields' => [

+ 6
- 2
resources/views/issue/firma.blade.php View File

113
 
113
 
114
           <div class="form-row">
114
           <div class="form-row">
115
             <div class="form-group col-md">
115
             <div class="form-group col-md">
116
-              {!! Form::label('note', 'Descrizione') !!}
117
-              {!! Form::textarea('note', null, ['class' => 'form-control']) !!}
116
+              {!! Form::label('note', 'Descrizione', ['style' => 'display: inline;']) !!} <button type="button" class="btn btn-sm btn-primary" onclick="svuotaDescrizione()">Svuota</button>
117
+              {!! Form::textarea('note', $descrizione, ['class' => 'form-control']) !!}
118
             </div>
118
             </div>
119
           </div>
119
           </div>
120
 
120
 
383
   }
383
   }
384
   $('#form_firma').submit();
384
   $('#form_firma').submit();
385
 }
385
 }
386
+
387
+function svuotaDescrizione(){
388
+    $('#note').empty();
389
+}
386
 </script>
390
 </script>

Loading…
Cancel
Save