瀏覽代碼

tecnico aggiuntivo

Roberto Santini 2 年之前
父節點
當前提交
e1f86a986c
共有 2 個檔案被更改,包括 8 行新增2 行删除
  1. 7
    2
      app/Http/Controllers/IssueController.php
  2. 1
    0
      app/Models/Issue.php

+ 7
- 2
app/Http/Controllers/IssueController.php 查看文件

360
           $tempoImpiegatoOnSite = Issue::getTempoImpiegato($issue->id, [Config::getValue(Config::ATTIVITA_ON_SITE), Config::TECNICO_AGGIUNTIVO], $from, $to, 'Sì');
360
           $tempoImpiegatoOnSite = Issue::getTempoImpiegato($issue->id, [Config::getValue(Config::ATTIVITA_ON_SITE), Config::TECNICO_AGGIUNTIVO], $from, $to, 'Sì');
361
           $tempoImpiegatoRemota = Issue::getTempoImpiegato($issue->id, [Config::getValue(Config::ATTIVITA_REMOTA)], $from, $to, 'Sì');
361
           $tempoImpiegatoRemota = Issue::getTempoImpiegato($issue->id, [Config::getValue(Config::ATTIVITA_REMOTA)], $from, $to, 'Sì');
362
 
362
 
363
+          // dd($tempoImpiegatoOnSite);
363
           foreach($tempoImpiegatoOnSite as $tempo){
364
           foreach($tempoImpiegatoOnSite as $tempo){
364
             // arrotondamento tempo
365
             // arrotondamento tempo
365
             $ore = $tempo->hours;
366
             $ore = $tempo->hours;
376
               'quantita' => $ore]
377
               'quantita' => $ore]
377
             );
378
             );
378
 
379
 
379
-            if($tempo->activity_id == Config::getValue(Config::ATTIVITA_ON_SITE)){
380
+            // if($tempo->activity->id == Config::getValue(Config::ATTIVITA_ON_SITE)){
380
               $collectionIssue->push([
381
               $collectionIssue->push([
381
                 'nome' => "Diritto fisso di uscita - #".$issue->id." - ".$sedeCliente." - ".$data,
382
                 'nome' => "Diritto fisso di uscita - #".$issue->id." - ".$sedeCliente." - ".$data,
382
                 'codice' => 'INT-USC',
383
                 'codice' => 'INT-USC',
383
                 'quantita' => 1]
384
                 'quantita' => 1]
384
               );
385
               );
385
-            }
386
+            // }
386
           }
387
           }
387
 
388
 
389
+          // return;
390
+
388
           foreach($tempoImpiegatoRemota as $tempo){
391
           foreach($tempoImpiegatoRemota as $tempo){
389
             $collectionIssue->push([
392
             $collectionIssue->push([
390
               'nome' => "Intervento Tecnico #".$issue->id." ".$issue->subject." - ".Carbon::parse($tempo->spent_on)->format('d/m/Y'),
393
               'nome' => "Intervento Tecnico #".$issue->id." ".$issue->subject." - ".Carbon::parse($tempo->spent_on)->format('d/m/Y'),
402
         $filename = 'issues';
405
         $filename = 'issues';
403
       }
406
       }
404
 
407
 
408
+      //dump($collectionIssue);
409
+
405
       return Excel::download(new IssueExport($collectionIssue), $filename.'.xlsx');
410
       return Excel::download(new IssueExport($collectionIssue), $filename.'.xlsx');
406
     }else{
411
     }else{
407
       Session::flash('flash_message', "Nessun progetto selezionato!");
412
       Session::flash('flash_message', "Nessun progetto selezionato!");

+ 1
- 0
app/Models/Issue.php 查看文件

79
     $issueResponse = Http::get(config('redmine.url').'/time_entries.json', $params);
79
     $issueResponse = Http::get(config('redmine.url').'/time_entries.json', $params);
80
 
80
 
81
     $last_date = null;
81
     $last_date = null;
82
+    // dd($issueResponse->object()->time_entries);
82
     try{
83
     try{
83
       foreach($issueResponse->object()->time_entries as $time){
84
       foreach($issueResponse->object()->time_entries as $time){
84
         // $collection->push($time);
85
         // $collection->push($time);

Loading…
取消
儲存