Skip to content

Commit c0047f0

Browse files
solemabrotherssolemabrothers
authored
Implement Filters
1 parent 8ae93ae commit c0047f0

27 files changed

+2917
-1124
lines changed

‎.idea/dataSources.xml‎

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/sqldialects.xml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.idea/symfony2.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/Http/Controllers/CircumscionPartnerController.php‎ renamed to ‎app/Http/Controllers/AgeGroupAchievement.php‎

Lines changed: 38 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,60 +5,53 @@
55
use App\AnalysisGraphs;
66
use App\Models\District;
77
use App\Models\Facility;
8-
use App\Models\PieChart;
8+
use App\Models\AgeGroupCategories;
99
use Illuminate\Http\Request;
1010
use DB;
1111
use Carbon\Carbon;
12-
class CircumscionPartnerController extends Controller
12+
class AgeGroupAchievement extends Controller
1313
{
1414

1515
public function index()
1616
{
17-
$facilities= DB::table('facility')->get();
18-
$clientsAffected = DB::table('circumscission')->select(DB::raw('SUM(NumberMildPain+NumberSeverePain+NumberMildExcessiveBleeding+NumberMildPain+
19-
NumberSeverePain+NumberMildExcessiveBleeding+NumberModerateExcessiveBleeding+NumberSevereExcessiveBleeding+NumberMildSwellingHaematoma+NumberMildSwellingHaematoma+
20-
NumberModerateSwellingHaematoma+NumberSevereSwellingHaematoma+NumberMildAnaestheticRelatedEvent+NumberModerateAnaestheticRelatedEvent+NumberSevereAnaestheticRelatedEvent+
21-
NumberMildExcessiveSkinRemoved+NumberModerateExcessiveSkinRemoved+NumberSevereExcessiveSkinRemoved+NumberMildInfection+NumberModerateInfection+NumberSevereInfection+
22-
NumberMildDamageToPenis+NumberModerateDamageToPenis+NumberSevereDamageToPenis)'))->get();
23-
24-
25-
26-
echo'<pre>';
27-
print_r($clientsAffected);
28-
29-
17+
//TODO
3018
}
3119

3220
public function numbersByAgeGroup()
3321
{
34-
$Between10And14 = DB::table('circumcision')->whereRaw('SummaryDate between \'2018-10-01\' and \'2019-09-30\'')->sum('NumberCircumcisedBetween10And14');
35-
$Between15And19 = DB::table('circumcision')->whereRaw('SummaryDate between \'2018-10-01\' and \'2019-09-30\'')->sum('NumberCircumcisedBetween15And19');
36-
$Between20And24 = DB::table('circumcision')->whereRaw('SummaryDate between \'2018-10-01\' and \'2019-09-30\'')->sum('NumberCircumcisedBetween20And24');
37-
$Between26And30 = DB::table('circumcision')->whereRaw('SummaryDate between \'2018-10-01\' and \'2019-09-30\'')->sum('NumberCircumcisedBetween25And29');
38-
$Between31And34= DB::table('circumcision')->whereRaw('SummaryDate between \'2018-10-01\' and \'2019-09-30\'')->sum('NumberCircumcisedBetween30And34');
39-
$Between35And39= DB::table('circumcision')->whereRaw('SummaryDate between \'2018-10-01\' and \'2019-09-30\'')->sum('NumberCircumcisedBetween35And39');
40-
$Between40And44= DB::table('circumcision')->whereRaw('SummaryDate between \'2018-10-01\' and \'2019-09-30\'')->sum('NumberCircumcisedBetween40And44');
41-
$Above45= DB::table('circumcision')->whereRaw('SummaryDate between \'2018-10-01\' and \'2019-09-30\'')->value(DB::raw("SUM(NumberCircumcisedBetween45And49+NumberCircumcisedBetween50And54+NumberCircumcisedBetween55And59+NumberCircumcised60andabove)"));
42-
43-
$Between10And14target = DB::table('ipmechanismtargets')->sum('10<14');
44-
$Between15And19target = DB::table('ipmechanismtargets')->sum('15<19');
45-
$Between20And24target = DB::table('ipmechanismtargets')->sum('20<24');
46-
$Between26And30target = DB::table('ipmechanismtargets')->sum('25<29');
47-
$Between31And34target= DB::table('ipmechanismtargets')->sum('30<34');
48-
$Between35And39target= DB::table('ipmechanismtargets')->sum('35<39');
49-
$Between40And44target= DB::table('ipmechanismtargets')->sum('40<49');
50-
$Above45target= DB::table('ipmechanismtargets')->sum('50>');
51-
52-
$Between10And14= new PieChart('10-14',$Between10And14,$Between10And14target);
53-
$Between15And19= new PieChart('15-19',$Between15And19,$Between15And19target);
54-
$Between20And24= new PieChart('20-24',$Between20And24,$Between20And24target);
55-
$Between26And30= new PieChart('25-29',$Between26And30,$Between26And30target);
56-
$Between31And34= new PieChart('30-34',$Between31And34,$Between31And34target);
57-
$Between35And39= new PieChart('35-39',$Between35And39,$Between35And39target);
58-
$Between40And44= new PieChart('40-44',$Between40And44,$Between40And44target);
59-
$Above45= new PieChart('>45',$Above45,$Above45target);
60-
61-
$pichartArray= array($Between10And14,$Between15And19,$Between20And24,$Between26And30,$Between31And34,$Between35And39,$Between40And44,$Above45);
22+
$Between10And14 = DB::table('circumcision')->whereRaw('SummaryDate >= \'2019-10-01\'')->sum('NumberCircumcisedBetween10And14');
23+
$Between15And19 = DB::table('circumcision')->whereRaw('SummaryDate >= \'2019-10-01\'')->sum('NumberCircumcisedBetween15And19');
24+
$Between20And24 = DB::table('circumcision')->whereRaw('SummaryDate >= \'2019-10-01\'')->sum('NumberCircumcisedBetween20And24');
25+
$Between26And30 = DB::table('circumcision')->whereRaw('SummaryDate >= \'2019-10-01\'')->sum('NumberCircumcisedBetween25And29');
26+
$Between31And34= DB::table('circumcision')->whereRaw('SummaryDate >= \'2019-10-01\'')->sum('NumberCircumcisedBetween30And34');
27+
$Between35And39= DB::table('circumcision')->whereRaw('SummaryDate >= \'2019-10-01\'')->sum('NumberCircumcisedBetween35And39');
28+
$Between40And44= DB::table('circumcision')->whereRaw('SummaryDate >= \'2019-10-01\'')->sum('NumberCircumcisedBetween40And44');
29+
$Between45And49= DB::table('circumcision')->whereRaw('SummaryDate >= \'2019-10-01\'')->sum('NumberCircumcisedBetween45And49');
30+
$Above45= DB::table('circumcision')->whereRaw('SummaryDate >= \'2019-10-01\'')->value(DB::raw("SUM(NumberCircumcisedBetween50And54+NumberCircumcisedBetween55And59+NumberCircumcised60andabove)"));
31+
32+
$Between10And14target = DB::table('ipmechanismtargets')->whereRaw('Year_of_target=\'2020\'')->sum('10<14');
33+
$Between15And19target = DB::table('ipmechanismtargets')->whereRaw('Year_of_target=\'2020\'')->sum('15<19');
34+
$Between20And24target = DB::table('ipmechanismtargets')->whereRaw('Year_of_target=\'2020\'')->sum('20<24');
35+
$Between26And30target = DB::table('ipmechanismtargets')->whereRaw('Year_of_target=\'2020\'')->sum('25<29');
36+
$Between31And34target= DB::table('ipmechanismtargets')->whereRaw('Year_of_target=\'2020\'')->sum('30<34');
37+
$Between35And39target= DB::table('ipmechanismtargets')->whereRaw('Year_of_target=\'2020\'')->sum('35<39');
38+
$Between40And44target= DB::table('ipmechanismtargets')->whereRaw('Year_of_target=\'2020\'')->sum('40<44');
39+
$Between45And49target= DB::table('ipmechanismtargets')->whereRaw('Year_of_target=\'2020\'')->sum('45<49');
40+
41+
$Above50target= DB::table('ipmechanismtargets')->sum('50>');
42+
43+
$Between10And14= new AgeGroupCategories('10-14',$Between10And14,$Between10And14target);
44+
$Between15And19= new AgeGroupCategories('15-19',$Between15And19,$Between15And19target);
45+
$Between20And24= new AgeGroupCategories('20-24',$Between20And24,$Between20And24target);
46+
$Between26And30= new AgeGroupCategories('25-29',$Between26And30,$Between26And30target);
47+
$Between31And34= new AgeGroupCategories('30-34',$Between31And34,$Between31And34target);
48+
$Between35And39= new AgeGroupCategories('35-39',$Between35And39,$Between35And39target);
49+
$Between40And44= new AgeGroupCategories('40-44',$Between40And44,$Between40And44target);
50+
$Between45And49= new AgeGroupCategories('45-49',$Between45And49,$Between45And49target);
51+
52+
$Above45= new AgeGroupCategories('>50',$Above45,$Above50target);
53+
54+
$pichartArray= array($Between10And14,$Between15And19,$Between20And24,$Between26And30,$Between31And34,$Between35And39,$Between40And44,$Between45And49,$Above45);
6255
for($i=0;$i<sizeof($pichartArray);$i++)
6356
{
6457
$agecategorynames[] =$pichartArray[$i]->objectname;
@@ -76,10 +69,8 @@ public function numbersByAgeGroup()
7669
array_push($ageperformance,$agecategorynames);
7770
array_push($ageperformance,$agecategoryperformance);
7871
array_push($ageperformance,$agecategorytarget);
79-
return json_encode($ageperformance,JSON_NUMERIC_CHECK);
80-
81-
return $ageperformance;
8272

73+
return json_encode($ageperformance,JSON_NUMERIC_CHECK);
8374
}
8475

8576

@@ -90,7 +81,7 @@ public function numbersByAgeGroup()
9081

9182
public function hivStatusClients()
9283
{
93-
$status_of_Clients = DB::select('SELECT monthname(SummaryDate) as months,
84+
$status_of_Clients = DB::select('SELECT monthname(SummaryDate) as months,
9485
SUM(c.NumberCircumcised) As Clients,SUM(c.NumberHIVPositive) AS HIVPOstive, SUM(c.NumberHIVNegative) As HIVNegative
9586
FROM mets_vmmc.circumcision c WHERE YEAR(SummaryDate)=YEAR(CURDATE()) group by monthname(c.SummaryDate) order by c.SummaryDate;');
9687

‎app/Http/Controllers/Controller.php‎

Lines changed: 20 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -21,104 +21,56 @@ class Controller extends BaseController
2121
public function index()
2222
{
2323
$ips = DB::table('implementingpartner')->get();
24-
$regions=DB::table('region')->get();
2524
$districts=DB::table('district')->get();
26-
$numbersHIVnegative=DB::select('SELECT SUM(c.NumberHIVNegative) as negative FROM mets_vmmc.circumcision c where c.SummaryDate between \'2018-10-01\' and \'2019-09-30\'');
27-
$numbersHIVpositive =DB::select('SELECT SUM(c.NumberHIVPositive) as positive FROM mets_vmmc.circumcision c where c.SummaryDate between \'2018-10-01\' and \'2019-09-30\'');
25+
$numbersHIVnegative=DB::select('SELECT SUM(c.NumberHIVNegative) as negative FROM mets_vmmc.circumcision c where c.SummaryDate >= \'2019-10-01\'');
26+
$numbersHIVpositive =DB::select('SELECT SUM(c.NumberHIVPositive) as positive FROM mets_vmmc.circumcision c where c.SummaryDate >= \'2019-10-01\'');
2827

2928
$SeverelyAffected =DB::select(' SELECT SUM(c.NumberSeverePain)+ SUM(c.NumberSevereExcessiveBleeding)+SUM(c.NumberSevereSwellingHaematoma)+
3029
+SUM(c.NumberSevereAnaestheticRelatedEvent)+ SUM(c.NumberSevereExcessiveSkinRemoved)+
3130
SUM(c.NumberSevereInfection)+SUM(c.NumberSevereDamageToPenis)+SUM(c.NumberMildExcessiveBleeding)+
3231
+SUM(c.NumberMildSwellingHaematoma)
3332
+SUM(c.NumberModerateInfection) As ClientsAffected
34-
FROM mets_vmmc.circumcision c where c.SummaryDate between \'2018-10-01\' and \'2019-09-30\'');
35-
$weeklyadverseeffects = DB::select('SELECT Ip.Ip_name,d.District_name,f.facility_name,f.Facility,SUM(c.NumberSevereSwellingHaematoma)
33+
FROM mets_vmmc.circumcision c where c.SummaryDate >= \'2019-10-01\'');
34+
$adverseeventsbyfacility = DB::select('SELECT Ip.Ip_name,d.District_name,f.facility_name,f.Facility,SUM(c.NumberSevereSwellingHaematoma)
3635
+SUM(c.NumberSevereAnaestheticRelatedEvent)+SUM(c.NumberSevereDamageToPenis)+SUM(c.NumberSevereExcessiveBleeding)
3736
+SUM(c.NumberSevereInfection)+SUM(c.NumberSeverePain)AS Severe,
3837
SUM(c.NumberMildExcessiveBleeding)+SUM(c.NumberMildSwellingHaematoma)+SUM(c.NumberModerateInfection)
3938
+SUM(c.NumberMildAnaestheticRelatedEvent)+SUM(c.NumberMildDamageToPenis)+SUM(c.NumberMildExcessiveSkinRemoved)
4039
+SUM(c.NumberMildPain)As ClientsAffected
4140
FROM mets_vmmc.circumcision c,mets_vmmc.implementingpartner Ip,mets_vmmc.district d, mets_vmmc.facility f WHERE c.ImplementingPartner=Ip.IP_ID AND c.Facility=f.Facility AND f.district_id=d.district_id
42-
AND c.SummaryDate between \'2018-10-01\' and \'2019-09-30\' group by facility,implementingpartner
41+
AND c.SummaryDate >= \'2019-10-01\' group by facility,implementingpartner
4342
HAVING ClientsAffected !=0 OR Severe!=0');
4443

45-
$HIVpositiveclients =DB::select('SELECT Ip.Ip_name, d.District_name, f.facility_name,SUM(c.NumberHIVPositive) as positive
44+
$clientsHIVPositivebyfacility =DB::select('SELECT Ip.Ip_name, d.District_name, f.facility_name,SUM(c.NumberHIVPositive) as positive
4645
FROM mets_vmmc.circumcision c,mets_vmmc.facility f , mets_vmmc.implementingpartner Ip, mets_vmmc.district d
4746
WHERE c.Facility=f.Facility AND c.ImplementingPartner= Ip.IP_ID AND f.district_id= d.district_id
48-
AND c.SummaryDate between \'2018-10-01\' and \'2019-09-30\' group by c.Facility,c.ImplementingPartner
47+
AND c.SummaryDate >= \'2019-10-01\' group by c.Facility,c.ImplementingPartner
4948
HAVING positive !=0');
5049

51-
$monthly_data = DB::select('SELECT i.Ip_name as ipmechanism,SUM(c.NumberCircumcisedBelow10) as category9, SUM(c.NumberCircumcisedBetween10And14) as category1,SUM(c.NumberCircumcisedBetween15And19)as category2,
52-
SUM(c.NumberCircumcisedBetween20And24) as category3,SUM(c.NumberCircumcisedBetween25And29) as category4,SUM(c.NumberCircumcisedBetween30And34) as category5,
53-
SUM(c.NumberCircumcisedBetween35And39) as category6,SUM(c.NumberCircumcisedBetween40And44) + SUM(NumberCircumcisedBetween45And49)as category7,
54-
SUM(c.NumberCircumcisedBetween50And54)+ SUM(c.NumberCircumcisedBetween55And59)+ SUM(c.NumberCircumcised60andabove) as category8
50+
$monthly_data = DB::select('SELECT i.Ip_name as ipmechanism,SUM(c.NumberCircumcisedBelow10) as category1, SUM(c.NumberCircumcisedBetween10And14) as category2,SUM(c.NumberCircumcisedBetween15And19)as category3,
51+
SUM(c.NumberCircumcisedBetween20And24) as category4,SUM(c.NumberCircumcisedBetween25And29) as category5,SUM(c.NumberCircumcisedBetween30And34) as category6,
52+
SUM(c.NumberCircumcisedBetween35And39) as category7,SUM(c.NumberCircumcisedBetween40And44) as category8,SUM(NumberCircumcisedBetween45And49)as category9,
53+
SUM(c.NumberCircumcisedBetween50And54)+ SUM(c.NumberCircumcisedBetween55And59)+ SUM(c.NumberCircumcised60andabove) as category10
5554
from circumcision c
5655
inner join implementingpartner i on c.ImplementingPartner = i.IP_ID
57-
where c.SummaryDate between \'2018-10-01\' AND \'2019-09-30\'
56+
where c.SummaryDate >= \'2019-10-01\'
5857
group by IP_ID');
5958

6059

6160
$totalnumbercircumscised =DB::select('SELECT SUM(c.NumberCircumcised) As total FROM mets_vmmc.circumcision c
62-
where c.SummaryDate between \'2018-10-01\' and \'2019-09-30\'');
63-
64-
$totaltarget =DB::select('SELECT SUM(TARGET) as target from mets_vmmc.ipmechanismtargets');
61+
where c.SummaryDate >= \'2019-10-01\'');
6562

63+
$totaltarget =DB::select('SELECT SUM(TARGET) as target from ipmechanismtargets t where t.Year_of_target=\'2020\'');
6664

65+
$totalnumbercircumscisedusingdevices=DB::select('select SUM(NumberDeviceType) as DevicesUsed from circumcision c where c.SummaryDate >=\'2019-10-01\'');
66+
$facilitiesusingdevices=DB::select('SELECT Ip.Ip_name,d.District_name,f.facility_name,f.Facility,SUM(c.NumberDeviceType) AS DevicesUsed
67+
FROM mets_vmmc.circumcision c,mets_vmmc.implementingpartner Ip,mets_vmmc.district d, mets_vmmc.facility f WHERE c.ImplementingPartner=Ip.IP_ID AND c.Facility=f.Facility AND f.district_id=d.district_id
68+
AND c.SummaryDate >= \'2019-10-01\' group by facility,implementingpartner
69+
HAVING DevicesUsed !=0');
6770
$totalperformance =number_format(($totalnumbercircumscised[0]->total/$totaltarget[0]->target)*100,2,'.','');
68-
// return $monthly_data;
69-
return view('layouts.home', compact('districts','ips','totalperformance','totaltarget','totalnumbercircumscised','regions','weeklyadverseeffects','SeverelyAffected','monthly_data','modelObjectJson','numbersHIVnegative','HIVpositiveclients','numbersHIVpositive','clientsAffected'));
71+
return view('layouts.home', compact('districts','ips','totalperformance','totaltarget','totalnumbercircumscised','adverseeventsbyfacility','facilitiesusingdevices','SeverelyAffected','monthly_data','modelObjectJson','numbersHIVnegative','clientsHIVPositivebyfacility','numbersHIVpositive','clientsAffected','totalnumbercircumscisedusingdevices'));
7072
}
7173

7274

73-
74-
public function getfilteredData(Request $request)
75-
{
76-
// $ips = DB::table('ImplementingPartner')->get();
77-
$ips = DB::table('implementingpartner')->get();
78-
$regions=DB::table('region')->get();
79-
$districts=DB::table('district')->get();
80-
81-
$ip_name = $request->input('ips');
82-
$today= Carbon::today();
83-
$yesterday=$today->subWeek();
84-
$sql= "SELECT SUM(circumcision.NumberCircumcised) As ipweeklyperformance FROM `mets_vmmc`.`circumcision`
85-
WHERE circumcision.SummaryDate>=DATE (NOW() - INTERVAL 7 DAY) AND circumcision.ImplementingPartner=$ip_name";
86-
$ipweeklyperformance = DB::select(DB::raw($sql));
87-
88-
$sql_query="SELECT SUM(circumcision.NumberHIVNegative) As ipnegativeclients FROM `mets_vmmc`.`circumcision`
89-
WHERE circumcision.SummaryDate>=DATE (NOW() - INTERVAL 7 DAY) AND circumcision.ImplementingPartner=$ip_name";
90-
$numbersHIVnegative=DB::select(DB::raw($sql_query));
91-
92-
$sql_positive="SELECT SUM(circumcision.NumberHIVPositive) As ippositiveclients FROM `mets_vmmc`.`circumcision`
93-
WHERE circumcision.SummaryDate>=DATE (NOW() - INTERVAL 7 DAY) AND circumcision.ImplementingPartner=$ip_name";
94-
$numbersHIVpositive=DB::select(DB::raw($sql_positive));
95-
96-
$clientsaffected ="SELECT SUM(c.NumberSeverePain)+ SUM(c.NumberSevereExcessiveBleeding)+SUM(c.NumberSevereSwellingHaematoma)+
97-
+SUM(c.NumberSevereAnaestheticRelatedEvent)+ SUM(c.NumberSevereExcessiveSkinRemoved)+
98-
SUM(c.NumberSevereInfection)+SUM(c.NumberSevereDamageToPenis) As ClientsAffected
99-
FROM mets_vmmc.circumcision c WHERE c.SummaryDate>=DATE (NOW() - INTERVAL 7 DAY) AND c.ImplementingPartner=$ip_name ";
100-
$clientsseverelyaffected=DB::select(DB::raw($clientsaffected));
101-
102-
$monthlydistrictPerformance ="SELECT
103-
IFNULL(District_name, 'TOTAL') AS District_name,
104-
SUM(IF (MONTH(c.SummaryDate) = 1, c.NumberCircumcised, 0)) AS January ,
105-
SUM(IF (MONTH(c.SummaryDate) = 2, c.NumberCircumcised, 0)) AS February ,
106-
SUM(IF (MONTH(c.SummaryDate) = 3, c.NumberCircumcised, 0)) AS March ,
107-
SUM(IF (MONTH(c.SummaryDate) = 4, c.NumberCircumcised, 0)) AS April ,
108-
SUM(IF (MONTH(c.SummaryDate) = 5, c.NumberCircumcised, 0)) AS May ,
109-
SUM(IF (MONTH(c.SummaryDate) = 6, c.NumberCircumcised, 0)) AS June ,
110-
SUM(IF (MONTH(c.SummaryDate) = 7, c.NumberCircumcised, 0)) AS July ,
111-
SUM(c.NumberCircumcised) as DistrictTotal
112-
113-
FROM mets_vmmc.Circumcision c, facility f, District d WHERE
114-
c.Facility = f.Facility AND f.district_id = d.District_ID AND YEAR(c.SummaryDate)=2018 AND c.implementingpartner=$ip_name GROUP BY f.district_id WITH ROLLUP";
115-
$monthly_data = DB::select(DB::raw($monthlydistrictPerformance));
116-
return view('layouts.filterdata', compact('ipweeklyperformance','numbersHIVnegative','monthly_data','ips','numbersHIVpositive','clientsseverelyaffected'));
117-
118-
119-
120-
121-
}
122-
12375
}
12476

‎app/Http/Controllers/DateManipulation.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Illuminate\Http\Request;
1111
use DB;
1212
use PDO;
13-
use App\Models\PieChart;
13+
use App\Models\FilteredAgeGroups;
1414

1515
use Illuminate\Database\SqlServerConnection;
1616
use Doctrine\DBAL\Driver\SQLSrv;
@@ -78,7 +78,7 @@ public function insertdata()
7878
echo 'Exception -> ';
7979
var_dump($e->getMessage());
8080
}
81-
81+
8282
}
8383
}
8484

0 commit comments

Comments
 (0)