Merge pull request #32 from CodeForCharlotte/feature/user-seed-method…

…-update Feature/user seed method update
OpenCLTBrigade · Oct 27, 2016 · e055189 · e055189
2 parents 7686766 + ec6ae36
commit e055189
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/_ide_helper.php b/_ide_helper.php
@@ -14072,7 +14072,7 @@ public static function getInstance(){
     }
 
 
-    class Recaptcha extends \Greggilbert\Recaptcha\Facades\Recaptcha{
+    class Recaptcha extends \GreggilGreggilbert\Recaptcha\RecaptchaServiceProviderbert\Recaptcha\Facades\Recaptcha{
 
         /**
          * Render the recaptcha

diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php
@@ -12,7 +12,7 @@ class UserController extends Controller
     public function index ()
     {
         // Don't select all fields to keep password hash and tokens private
-        $Users = \App\User::query()->select(["id", "name_first", "name_last", "rank", "phone", "affiliation_id", "email", "created_at", "updated_at"])->paginate(5);
-        return $Users;
+            $Users = \App\User::query()->select(["id", "name_first", "name_last", "rank", "phone", "affiliation_id", "email", "created_at", "updated_at"])->paginate(5);
+            return $Users;
     }
 }
diff --git a/database/seeds/UsersTableSeeder.php b/database/seeds/UsersTableSeeder.php
@@ -53,14 +53,30 @@ public function run()
                 "affiliation_id"    => 1,
                 "email"             => "[email protected]",
                 'password'          => 'admin',
-                'nomination_limit'  => 5,
+                'nomination_limit'  => 1000000,
                 'active' => 'Y',
             ]
         );
 
         $role = \App\Role::find(1);
         $newUser->attachRole($role);
 
+        // Add test nominator account
+        $newUser2 = App\User::create(
+            [
+                'name_first'        => "Nominator",
+                'name_last'         => "Account",
+                "affiliation_id"    => 2,
+                "email"             => "[email protected]",
+                'password'          => 'nomnom',
+                'nomination_limit'  => 5,
+                'active' => 'Y',
+            ]
+        );
+
+        $role2 = \App\Role::find(2);
+        $newUser2->attachRole($role2);
+
 
     }
 }
diff --git a/resources/views/partials/forms/household.blade.php b/resources/views/partials/forms/household.blade.php
@@ -244,7 +244,7 @@
 
   <div v-for="record in household.child" class="box box-success">
     <div class="box-header with-border">
-      <h1 class="box-title">Child @{{$index+1}} <span v-if="(record.name_first || record.name_last) && (record.name_first.length > 0 || record.name_last.length > 0)">-</span> @{{record.name_first}} @{{record.name_last}}</h1>
+      <h1 class="box-title">Child @{{$index+1}} <span v-if="record.name_first.length > 0 || record.name_last.length > 0">-</span> @{{record.name_first}} @{{record.name_last}}</h1>
     </div>