Roberto Santini 3 jaren geleden
bovenliggende
commit
e5a609a563

+ 1
- 1
app/Http/Controllers/IssueController.php Bestand weergeven

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

+ 10
- 4
app/Http/Controllers/UserController.php Bestand weergeven

@@ -107,13 +107,19 @@ class UserController extends Controller
107 107
   public function load_progetti(Request $request){
108 108
     $redmineUser = session('redmine_user');
109 109
     $user = User::find($request->user_id);
110
+    $userProg = json_decode($user->progetti);
111
+    if($userProg == null){
112
+      $userProg = array();
113
+    }
110 114
 
111 115
     $progettiUser = new Collection;
112 116
     $progetti = new Collection;
113 117
 
114
-    // Lista di tutti i progetti
118
+    // Lista di tutti i progetti assegnati all'utente
115 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 125
     // Lista di 30 progetti filtrati per ricerca
@@ -124,13 +130,13 @@ class UserController extends Controller
124 130
     ]);
125 131
 
126 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 134
         $progettiUser->push($project);
129 135
       }
130 136
     }
131 137
 
132 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 140
         $progetti->push($project);
135 141
       }
136 142
     }

+ 1
- 1
app/Models/Issue.php Bestand weergeven

@@ -56,7 +56,7 @@ class Issue{
56 56
     $issueResponse = Http::get(config('redmine.url').'/time_entries.json', [
57 57
       'key' => $redmineUser->api_key,
58 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 60
       'activity_id' => $attivita
61 61
 
62 62
     ]);

+ 1
- 1
resources/views/issue/show.blade.php Bestand weergeven

@@ -114,7 +114,7 @@ $tempoImpiegatoRemota = Issue::getTempoImpiegato($issue->id, Config::getValue(Co
114 114
             </li>
115 115
             @endforeach
116 116
           </ul>
117
-          <b>Totale ore remote: </b> {{ $sum_ore_onsite }}h
117
+          <b>Totale ore remote: </b> {{ $sum_ore_remota }}h
118 118
           @endif
119 119
         </div>
120 120
       </div>

Laden…
Annuleren
Opslaan