|
|
@@ -65,6 +65,7 @@ class IssueController extends Controller
|
|
65
|
65
|
// Issue details
|
|
66
|
66
|
$response_issue = Http::get(session('azienda')->redmine_url.'/issues/'.$id.'.json?include=attachments,relations,custom_fields', [
|
|
67
|
67
|
'key' => $redmineUser->api_key,
|
|
|
68
|
+ 'include' => 'journals'
|
|
68
|
69
|
]);
|
|
69
|
70
|
$issue = $response_issue->object()->issue;
|
|
70
|
71
|
|
|
|
@@ -121,6 +122,18 @@ class IssueController extends Controller
|
|
121
|
122
|
|
|
122
|
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
|
139
|
return view('issue.firma')->with([
|
|
|
@@ -130,7 +143,8 @@ class IssueController extends Controller
|
|
130
|
143
|
'altriTecnici' => $altriTecnici,
|
|
131
|
144
|
'altreSegnalazioni' => $collectionAltreSegnalazioni,
|
|
132
|
145
|
'user' => $user,
|
|
133
|
|
- 'sedeCliente' => $sedeCliente
|
|
|
146
|
+ 'sedeCliente' => $sedeCliente,
|
|
|
147
|
+ 'descrizione' => $descrizione
|
|
134
|
148
|
]);
|
|
135
|
149
|
}
|
|
136
|
150
|
|
|
|
@@ -353,7 +367,7 @@ class IssueController extends Controller
|
|
353
|
367
|
'issue_id' => $request->issue_id,
|
|
354
|
368
|
'spent_on' => $dataIntervento->toDateString(),
|
|
355
|
369
|
'hours' => $request->ore_viaggio,
|
|
356
|
|
- 'comments' => '',
|
|
|
370
|
+ 'comments' => 'Viaggio',
|
|
357
|
371
|
'activity_id' => Config::getValue(Config::ATTIVITA_VIAGGIO),
|
|
358
|
372
|
'user_id' => $key,
|
|
359
|
373
|
'custom_fields' => [
|