Roberto Santini 3 years ago
parent
commit
e5a609a563

+ 1
- 1
app/Http/Controllers/IssueController.php View File

57
     if($response_issue->ok()){
57
     if($response_issue->ok()){
58
       $issue = $response_issue->object()->issue;
58
       $issue = $response_issue->object()->issue;
59
 
59
 
60
-      $helpdesk = $response_helpesk->object()->helpdesk_ticket;
61
 
60
 
62
       // Controllo che l'issue sia di uno dei progetti abilitati
61
       // Controllo che l'issue sia di uno dei progetti abilitati
63
       if(!in_array($issue->project->id, json_decode(Auth::user()->progetti))){
62
       if(!in_array($issue->project->id, json_decode(Auth::user()->progetti))){
65
       }
64
       }
66
 
65
 
67
       try{
66
       try{
67
+        $helpdesk = $response_helpesk->object()->helpdesk_ticket;
68
         $author = $helpdesk->contact->name." (".$helpdesk->from_address.")";
68
         $author = $helpdesk->contact->name." (".$helpdesk->from_address.")";
69
       }catch(\Exception $e){
69
       }catch(\Exception $e){
70
         $author = $issue->author->name;
70
         $author = $issue->author->name;

+ 10
- 4
app/Http/Controllers/UserController.php View File

107
   public function load_progetti(Request $request){
107
   public function load_progetti(Request $request){
108
     $redmineUser = session('redmine_user');
108
     $redmineUser = session('redmine_user');
109
     $user = User::find($request->user_id);
109
     $user = User::find($request->user_id);
110
+    $userProg = json_decode($user->progetti);
111
+    if($userProg == null){
112
+      $userProg = array();
113
+    }
110
 
114
 
111
     $progettiUser = new Collection;
115
     $progettiUser = new Collection;
112
     $progetti = new Collection;
116
     $progetti = new Collection;
113
 
117
 
114
-    // Lista di tutti i progetti
118
+    // Lista di tutti i progetti assegnati all'utente
115
     $projectResponseUser = Http::get(config('redmine.url').'/projects.json', [
119
     $projectResponseUser = Http::get(config('redmine.url').'/projects.json', [
116
-      'key' => $redmineUser->api_key
120
+      'key' => $redmineUser->api_key,
121
+      'id' => ($userProg!=null && count($userProg)>0)?implode('|', $userProg):'',
122
+      'limit' => 100
117
     ]);
123
     ]);
118
 
124
 
119
     // Lista di 30 progetti filtrati per ricerca
125
     // Lista di 30 progetti filtrati per ricerca
124
     ]);
130
     ]);
125
 
131
 
126
     foreach($projectResponseUser->object()->projects as $project){
132
     foreach($projectResponseUser->object()->projects as $project){
127
-      if(in_array($project->id, json_decode($user->progetti))){
133
+      if(in_array($project->id, $userProg)){
128
         $progettiUser->push($project);
134
         $progettiUser->push($project);
129
       }
135
       }
130
     }
136
     }
131
 
137
 
132
     foreach($projectResponse->object()->projects as $project){
138
     foreach($projectResponse->object()->projects as $project){
133
-      if(!in_array($project->id, json_decode($user->progetti))){
139
+      if(!in_array($project->id, $userProg)){
134
         $progetti->push($project);
140
         $progetti->push($project);
135
       }
141
       }
136
     }
142
     }

+ 1
- 1
app/Models/Issue.php View File

56
     $issueResponse = Http::get(config('redmine.url').'/time_entries.json', [
56
     $issueResponse = Http::get(config('redmine.url').'/time_entries.json', [
57
       'key' => $redmineUser->api_key,
57
       'key' => $redmineUser->api_key,
58
       'issue_id' => $issue_id,
58
       'issue_id' => $issue_id,
59
-      'cf_'.Config::getValue(Config::CAMPO_FATTURARE) => 'Si', // Custom fields "fatturare"
59
+      'cf_'.Config::getValue(Config::CAMPO_FATTURARE) => 'Sì|Fatturato', // Custom fields "fatturare"
60
       'activity_id' => $attivita
60
       'activity_id' => $attivita
61
 
61
 
62
     ]);
62
     ]);

+ 1
- 1
resources/views/issue/show.blade.php View File

114
             </li>
114
             </li>
115
             @endforeach
115
             @endforeach
116
           </ul>
116
           </ul>
117
-          <b>Totale ore remote: </b> {{ $sum_ore_onsite }}h
117
+          <b>Totale ore remote: </b> {{ $sum_ore_remota }}h
118
           @endif
118
           @endif
119
         </div>
119
         </div>
120
       </div>
120
       </div>

Loading…
Cancel
Save