Installation Export Fix

flexyourrights · Nov 3, 2019 · 34eb52c · 34eb52c
1 parent 45f2306
commit 34eb52c
Show file tree

Hide file tree

Showing 4 changed files with 121 additions and 84 deletions.
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ Laravel framework, and has continued to grow towards a content-management system
 
 The upcoming Open Police web app can be tested out here, 
 feedback welcome via the end of the <b>beta demo</b> submission process:<br />
-<a href="https://openpolice.org/filing-your-police-complaint" target="_blank">/filing-your-police-complaint</a><br />
+<a href="https://openpolice.org/file-your-police-complaint" target="_blank">/file-your-police-complaint</a><br />
 The resulting database designed using the engine, as well as the branching tree which specifies the user's experience: 
 <a href="https://openpolice.org/db/OP" target="_blank">/db/OP</a><br />
 <a href="https://openpolice.org/tree/complaint" target="_blank">/tree/complaint</a><br />
@@ -62,7 +62,7 @@ XML included an automatically generated schema, eg.<br />
 
 ## Installing Open Police Complaints
 
-<a href="http://openpolice.local/how-to-install-local-openpolice" target="_blank">Full install instructions</a> also describe how to set up a development environment using VirutalBox, Vargrant, and Laravel's Homestead.
+<a href="https://openpolice.org/how-to-install-local-openpolice" target="_blank">Full install instructions</a> also describe how to set up a development environment using VirutalBox, Vargrant, and Laravel's Homestead.
 
 ### Install Laravel Using Composer
 ```
@@ -123,8 +123,6 @@ Add the package to your application service providers in `config/app.php`.
 $ nano config/app.php
 ```
 ```
-...
-    'name' => 'OpenPolice',
 ...
 'providers' => [
     ...
@@ -164,7 +162,7 @@ $ php artisan db:seed --class=SurvLoopSeeder
 $ php artisan db:seed --class=ZipCodeSeeder
 $ php artisan db:seed --class=OpenPoliceSeeder
 $ php artisan db:seed --class=OpenPoliceDeptSeeder
-$ php artisan optimize
+$ php artisan optimize:clear
 ```
 
 For now, to apply database design changes to the same installation you are working in, depending on your server, you might also need something like this...
@@ -177,7 +175,7 @@ You might need to re-run some things outside the virtual box too, e.g.
 ```
 $ exit
 $ cd ~/homestead/code/openpolice
-$ php artisan optimize
+$ php artisan optimize:clear
 $ composer dump-autoload
 ```
 

diff --git a/src/Controllers/OpenPolicePeople.php b/src/Controllers/OpenPolicePeople.php
@@ -492,15 +492,15 @@ protected function loadPartnerTypes()
         if (!isset($this->v["prtnTypes"])) {
             $this->v["prtnTypes"] = [
                 [
-                    "abbr" => 'org',
-                    "sing" => 'Organization',
-                    "plur" => 'Organizations', 
+                    "abbr"  => 'org',
+                    "sing"  => 'Organization',
+                    "plur"  => 'Organizations', 
                     "defID" => $GLOBALS["SL"]
                         ->def->getID('Partner Types', 'Organization')
                 ], [
-                    "abbr" => 'attorney',
-                    "sing" => 'Attorney',
-                    "plur" => 'Attorneys', 
+                    "abbr"  => 'attorney',
+                    "sing"  => 'Attorney',
+                    "plur"  => 'Attorneys', 
                     "defID" => $GLOBALS["SL"]
                         ->def->getID('Partner Types', 'Attorney')
                 ]

diff --git a/src/Controllers/OpenPoliceVars.php b/src/Controllers/OpenPoliceVars.php
@@ -19,6 +19,7 @@ class OpenPoliceVars extends TreeSurvForm
 
     protected $allCivs         = [];
     protected $allegations     = [];
+
     public $worstAllegations   = [ // Allegations in descending order of severity, Definition IDs
         [126, 'Sexual Assault',                 'AlleSilSexualAssault'],
         [115, 'Unreasonable Force',             'AlleSilForceUnreason'],
@@ -41,38 +42,44 @@ class OpenPoliceVars extends TreeSurvForm
         //[131, 'Miranda Rights',                 'AlleSilArrestMiranda'],
         [130, 'Officer Refused To Provide ID',  'AlleSilOfficerRefuseID']
     ];
+
     public $eventTypes = [
         'Stops',
         'Searches',
         'Force',
         'Arrests'
     ];
+
     public $eveTypIDs = [
         252 => 'Stops',
         253 => 'Searches',
         254 => 'Force',
         255 => 'Arrests'
     ];
+
     protected $eventTypeLabel = [
         'Stops'    => 'Stop/Questioning',
         'Searches' => 'Search/Seizure',
         'Force'    => 'Use of Force',
         'Arrests'  => 'Arrest'
     ];
+
     protected $eventGoldAllegs = [
         'Stops'    => [117, 118],
         'Searches' => [119, 120, 496],
         'Force'    => [115],
         'Arrests'  => [116, 122]
     ];
+
     protected $cmplntUpNodes   = [
         280,
         324,
         317,
         413,
         371
     ];
+
     protected $eventTypeLookup = []; // $eveSeqID => 'Event Type'
     protected $eventCivLookup  = []; // array('Event Type' => array($civID, $civID, $civID))
-    
+
 }