Skip to content

Commit

Permalink
More Installation Cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
@rockhopsoft
rockhopsoft committed Nov 6, 2019
1 parent 651486e commit 7ff7f2e
Show file tree
Hide file tree
Showing 15 changed files with 4,178 additions and 739 deletions.
16 changes: 8 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@

# <a name="about"></a>About

* PHP Controllers ~ 385 KB (on disk)
* Blade Template Views HTML with some JS CSS ~ 373 KB
* SurvLoop-Generated PHP Eloquent Data Table Models ~ 311 KB
* SurvLoop-Generated PHP Laravel Database Migration & Seeders ~ 1.5 MB
* <a href="https://packagist.org/packages/flexyourrights/openpolice-departments" target="_blank">SurvLoop-Generated PHP Police Departments & Oversight Seeders</a> ~ 9.9 MB
* PHP Controllers ~ 537 KB (on disk)
* Blade Template Views HTML with some JS CSS ~ 520 KB
* SurvLoop-Generated PHP Eloquent Data Table Models ~ 332 KB
* SurvLoop-Generated PHP Laravel Database Migration & Seeders ~ 2.1 MB
* <a href="https://packagist.org/packages/flexyourrights/openpolice-departments" target="_blank">SurvLoop-Generated PHP Police Departments & Oversight Seeders</a> ~ 9.4 MB

Open Police is an open-source, open data web app empowering citizens to prepare, file, and track reports of police
conduct. The site helps users submit complaints or commendations to appropriate police oversight agencies. By allowing
Expand Down Expand Up @@ -54,7 +54,7 @@ XML included an automatically generated schema, eg.<br />

* php: >=7.2
* <a href="https://packagist.org/packages/laravel/laravel" target="_blank">laravel/laravel</a>: 5.8.*
* <a href="https://packagist.org/packages/wikiworldorder/survloop" target="_blank">wikiworldorder/survloop</a>: >=0.2.8
* <a href="https://packagist.org/packages/wikiworldorder/survloop" target="_blank">wikiworldorder/survloop</a>: >=0.2.10
* <a href="https://packagist.org/packages/flexyourrights/openpolice-departments" target="_blank">flexyourrights/openpolice-departments</a>: 0.1.*
* <a href="https://packagist.org/packages/flexyourrights/openpolice-website" target="_blank">flexyourrights/openpolice-website</a>: 0.1.*

Expand Down Expand Up @@ -97,8 +97,8 @@ $ nano composer.json
...
"require": {
...
"wikiworldorder/survloop": "^0.2.8",
"flexyourrights/openpolice": "^0.2.8",
"wikiworldorder/survloop": "^0.2.10",
"flexyourrights/openpolice": "^0.2.10",
...
},
...
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}
],
"require": {
"wikiworldorder/survloop": "^v0.2.8",
"wikiworldorder/survloop": "^v0.2.10",
"flexyourrights/openpolice-departments": "^v0.1.2",
"flexyourrights/openpolice-website": "^v0.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Controllers/DepartmentScores.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ public function printTotsBars()
$done[] = $ind;
}

return view('vendor.openpolice.nodes.inc-depts-score-criteria-bars', [
return view('vendor.openpolice.nodes.1816-depts-score-criteria-bars', [
"datOut" => $datOut,
"colorG" => $this->gradeColors[0],
"colorB" => $this->gradeColors[4]
Expand Down
8 changes: 4 additions & 4 deletions src/Controllers/OpenPartners.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ protected function printPartnerCapabilitiesOverview()
* @param string $type
* @return string
*/
protected function printManageAttorneys($type = 'Attorney')
protected function printManagePartners($type = 'Attorney')
{
$ret = '';
$this->loadPartnerTypes();
Expand All @@ -90,7 +90,7 @@ protected function printManageAttorneys($type = 'Attorney')
$this->v["partners"] = $this->getPartnersOfType($p["defID"]);
$this->v["prtnType"] = $p;
return view(
'vendor.openpolice.nodes.2166-manage-attorneys',
'vendor.openpolice.nodes.2166-manage-partners',
$this->v
)->render();
}
Expand Down Expand Up @@ -242,7 +242,7 @@ protected function publicPartnerHeader($nID = -3)
$attDef = $GLOBALS['SL']->def->getID('Partner Types', 'Attorney');
$slg = (($this->sessData->dataSets['Partners'][0]->PartType == $attDef)
? 'attorney' : 'org');
return view('vendor.openpolice.nodes.1961-public-attorney-header', [
return view('vendor.openpolice.nodes.1961-public-partner-header', [
"nID" => $nID,
"dat" => $this->sessData->dataSets,
"slg" => $slg
Expand Down Expand Up @@ -393,7 +393,7 @@ protected function publicPartnerPage($nID = -3)
if (!isset($this->sessData->dataSets["Partners"])) {
return '';
}
return view('vendor.openpolice.nodes.1898-public-attorney-page', [
return view('vendor.openpolice.nodes.1898-public-partner-page', [
"nID" => $nID,
"dat" => $this->sessData->dataSets,
"type" => $this->sessData->dataSets["Partners"][0]->PartType
Expand Down
60 changes: 38 additions & 22 deletions src/Controllers/OpenPolice.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ protected function customNodePrint($nID = -3, $tmpSubTier = [], $nIDtxt = '', $n
return $this->printDeptSearch($nID);
} elseif ($nID == 203) {
$this->initBlnkAllegsSilv();
} elseif (in_array($nID, [270, 973])) {
return $this->printEndOfComplaintRedirect($nID);
} elseif ($nID == 2341) {
return $this->printAllegAudit();
} elseif (in_array($nID, [270, 973])) {
return $this->printEndOfComplaintRedirect($nID);

// Home Page
} elseif ($nID == 1876) {
Expand Down Expand Up @@ -119,6 +119,16 @@ protected function customNodePrint($nID = -3, $tmpSubTier = [], $nIDtxt = '', $n
} elseif ($nID == 1893) {
return $this->printProfileMyComplaints($nID);

// Complaint Report Tools
} elseif ($nID == 1712) {
return $this->printComplaintAdmin();
} elseif ($nID == 1713) {
return $this->printComplaintOversight();
} elseif ($nID == 1714) {
return $this->printComplaintOwner();
} elseif ($nID == 1780) {
return $this->printMfaInstruct();

// Complaint Report
} elseif ($nID == 1374) {
return $this->reportAllegsWhy($nID);
Expand Down Expand Up @@ -146,14 +156,14 @@ protected function customNodePrint($nID = -3, $tmpSubTier = [], $nIDtxt = '', $n

} elseif ($nID == 1476) {
return $this->getOffReportNameHeader($nID);
} elseif (in_array($nID, [1795, 2266, 2335])) {
return $this->getReportUploads($nID);
} elseif ($nID == 1478) {
return [ $this->getCivSnstvFldsNotPrinted($this->sessData->getLatestDataBranchID()) ];
$civID = $this->sessData->getLatestDataBranchID();
return [ $this->getCivSnstvFldsNotPrinted($civID) ];
} elseif ($nID == 1511) {
return $this->reportCivAddy($nID);
} elseif ($nID == 1519) {
return [ $this->getOffSnstvFldsNotPrinted($this->sessData->getLatestDataBranchID()) ];
$civID = $this->sessData->getLatestDataBranchID();
return [ $this->getOffSnstvFldsNotPrinted($civID) ];
} elseif ($nID == 1566) {
return $this->getOffProfan();
} elseif ($nID == 1567) {
Expand All @@ -164,20 +174,14 @@ protected function customNodePrint($nID = -3, $tmpSubTier = [], $nIDtxt = '', $n
return $this->reportEventTitle($this->sessData->getLatestDataBranchID());
} elseif ($nID == 1710) {
return $this->printReportShare();
} elseif (in_array($nID, [1795, 2266, 2335])) {
return $this->getReportUploads($nID);
} elseif ($nID == 1707) {
return $this->printGlossary();
} elseif ($nID == 1708) {
return $this->printFlexArts();
} elseif ($nID == 1753) {
return $this->printFlexVids();
} elseif ($nID == 1712) {
return $this->printComplaintAdmin();
} elseif ($nID == 1713) {
return $this->printComplaintOversight();
} elseif ($nID == 1714) {
return $this->printComplaintOwner();
} elseif ($nID == 1780) {
return $this->printMfaInstruct();
} elseif ($nID == 1708) {
return $this->printFlexArts();
} elseif ($nID == 2164) {
return $this->printComplaintSessPath();
} elseif ($nID == 2632) {
Expand Down Expand Up @@ -209,9 +213,9 @@ protected function customNodePrint($nID = -3, $tmpSubTier = [], $nIDtxt = '', $n
} elseif ($nID == 2169) {
return $this->printPartnerCapabilitiesOverview();
} elseif ($nID == 2166) {
return $this->printManageAttorneys();
return $this->printManagePartners();
} elseif ($nID == 2171) {
return $this->printManageAttorneys('Organization');
return $this->printManagePartners('Organization');
} elseif ($nID == 1924) {
return $this->initPartnerCaseTypes($nID);
} elseif ($nID == 2181) {
Expand All @@ -236,13 +240,25 @@ protected function customNodePrint($nID = -3, $tmpSubTier = [], $nIDtxt = '', $n
} elseif ($nID == 2162) {
return $this->printDeptEditHeader2();
} elseif ($nID == 1261) {
return view('vendor.openpolice.nodes.1261-volun-dept-edit-wiki-stats', $this->v)->render();
return view(
'vendor.openpolice.nodes.1261-volun-dept-edit-wiki-stats',
$this->v
)->render();
} elseif ($nID == 1809) {
return view('vendor.openpolice.nodes.1809-volun-dept-edit-how-investigate', $this->v)->render();
return view(
'vendor.openpolice.nodes.1809-volun-dept-edit-how-investigate',
$this->v
)->render();
} elseif ($nID == 1227) {
return view('vendor.openpolice.nodes.1227-volun-dept-edit-search-complaint', $this->v)->render();
return view(
'vendor.openpolice.nodes.1227-volun-dept-edit-search-complaint',
$this->v
)->render();
} elseif ($nID == 1231) {
return view('vendor.openpolice.volun.volun-dept-edit-history', $this->v)->render();
return view(
'vendor.openpolice.volun.volun-dept-edit-history',
$this->v
)->render();
} elseif ($nID == 1338) {
return $GLOBALS["SL"]->getBlurbAndSwap('Volunteer Checklist');
} elseif ($nID == 1340) {
Expand Down
5 changes: 4 additions & 1 deletion src/Controllers/OpenVolunteers.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,10 @@ public function printVolunLocationForm()
}
}
}
return view('vendor.openpolice.nodes.1217-volun-home-your-info', $this->v)->render();
return view(
'vendor.openpolice.nodes.1217-volun-home-your-info',
$this->v
)->render();
}


Expand Down
Loading

0 comments on commit 7ff7f2e

Please sign in to comment.