Merge branch 'master' of github.com:UNICEF01/busca-ativa-escolar-api

UNICEF01 · Feb 7, 2019 · d9259d8 · d9259d8
2 parents 4940c63 + 4e25eac
commit d9259d8
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/app/Http/Controllers/LP/ReportsLandingPageController.php b/app/Http/Controllers/LP/ReportsLandingPageController.php
@@ -33,10 +33,10 @@ public function report_country(){
                 })->whereHas('child', function ($query){
                     $query->where('alert_status', '=', 'accepted');
                 })
-                ->where(function ($query){
-                    $query->where('case_status', '=', ChildCase::STATUS_IN_PROGRESS)
-                        ->orWhere('case_status', '=', ChildCase::STATUS_COMPLETED);
-                })->count();
+                    ->where(function ($query){
+                        $query->where('case_status', '=', ChildCase::STATUS_IN_PROGRESS)
+                            ->orWhere('case_status', '=', ChildCase::STATUS_COMPLETED);
+                    })->count();
 
                 if($qtd > 0){
                     array_push($causes, ['id' => $cause->id, 'cause' => $cause->label, 'qtd' => $qtd]);
@@ -68,7 +68,7 @@ public function report_country(){
 
                 'cases' => [
                     '_enrollment' => Child::query()
-                        ->whereIn('child_status', [Child::STATUS_IN_SCHOOL])
+                        ->whereIn('child_status', [Child::STATUS_IN_SCHOOL, Child::STATUS_OBSERVATION])
                         ->accepted()
                         ->count(),
                     '_in_progress' => ChildCase::whereHas('child', function ($query) {
@@ -101,15 +101,15 @@ public function report_uf(){
                 $qtd = ChildCase::where(function ($query) use ($cause){
                     $query->where('alert_cause_id', '=', "{$cause->id}");
                 })
-                ->where(function ($query){
-                    $query->where('case_status', '=', ChildCase::STATUS_IN_PROGRESS)
-                        ->orWhere('case_status', '=', ChildCase::STATUS_COMPLETED);
-                })->whereHas('child', function ($query){
+                    ->where(function ($query){
+                        $query->where('case_status', '=', ChildCase::STATUS_IN_PROGRESS)
+                            ->orWhere('case_status', '=', ChildCase::STATUS_COMPLETED);
+                    })->whereHas('child', function ($query){
                         $query->where('alert_status', '=', 'accepted');
-                })->whereHas('tenant', function ($query) use ($uf){
-                    $query->where('uf', '=', $uf);
-                })
-                ->count();
+                    })->whereHas('tenant', function ($query) use ($uf){
+                        $query->where('uf', '=', $uf);
+                    })
+                    ->count();
 
                 if($qtd > 0){
                     array_push($causes, ['id' => $cause->id, 'cause' => $cause->label, 'qtd' => $qtd]);
@@ -141,19 +141,19 @@ public function report_uf(){
 
                 'cases' => [
                     '_enrollment' => Child::query()
-                        ->whereIn('child_status', [Child::STATUS_IN_SCHOOL])
+                        ->whereIn('child_status', [Child::STATUS_IN_SCHOOL, Child::STATUS_OBSERVATION])
                         ->accepted()
                         ->whereHas('tenant', function ($query) use ($uf){
                             $query->where('uf', '=', $uf);
                         })
                         ->count(),
 
                     '_in_progress' => ChildCase::whereHas('child', function ($query) {
-                            $query->whereIn('child_status', [Child::STATUS_OUT_OF_SCHOOL, Child::STATUS_OBSERVATION])
-                                ->where('alert_status', '=', 'accepted');
-                        })->where('case_status', '=', 'in_progress')->whereHas('tenant', function ($query) use ($uf){
-                            $query->where('uf', '=', $uf);
-                        })->count()
+                        $query->whereIn('child_status', [Child::STATUS_OUT_OF_SCHOOL, Child::STATUS_OBSERVATION])
+                            ->where('alert_status', '=', 'accepted');
+                    })->where('case_status', '=', 'in_progress')->whereHas('tenant', function ($query) use ($uf){
+                        $query->where('uf', '=', $uf);
+                    })->count()
                 ],
 
                 'causes' => $causes
@@ -241,7 +241,7 @@ public function report_city(){
 
                 'cases' => [
                     '_enrollment' => Child::query()
-                        ->whereIn('child_status', [Child::STATUS_IN_SCHOOL])
+                        ->whereIn('child_status', [Child::STATUS_IN_SCHOOL, Child::STATUS_OBSERVATION])
                         ->accepted()
                         ->whereHas('tenant', function ($query) use ($city, $uf){
                             $query->where('name', '=', $uf.' / '.$city);