Merge pull request #295 from utmsigep/messenger-exclude-empty

Exclude empty phone/email in mass messenger

Author: stephenyeargin

src/Form/MemberEmailType.php

@@ -49,6 +49,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     return $er->createQueryBuilder('m')
                         ->join('m.status', 's')
                         ->where('s.isInactive = 0')
+                        ->andWhere('m.primaryEmail != :empty')
+                        ->setParameter('empty', '')
                         ->addOrderBy('s.label', 'ASC')
                         ->addOrderBy('m.lastName', 'ASC')
                         ->addOrderBy('m.preferredName', 'ASC')

src/Form/MemberSMSType.php

@@ -34,6 +34,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     return $er->createQueryBuilder('m')
                         ->join('m.status', 's')
                         ->where('s.isInactive = 0')
+                        ->andWhere('m.primaryTelephoneNumber != :empty')
+                        ->setParameter('empty', '')
                         ->addOrderBy('s.label', 'ASC')
                         ->addOrderBy('m.lastName', 'ASC')
                         ->addOrderBy('m.preferredName', 'ASC')

templates/_modal_hotkeys.html.twig

@@ -7,10 +7,10 @@
       </div>
       <div class="modal-body">
         <dl class="row"">
-          <dt class="col-sm-1"><code>?</tt></code>
-          <dd class="col-sm-11">Show this help modal</dt>
-          <dt class="col-sm-1"><code>/</tt></code>
-          <dd class="col-sm-11">Focus on search field</dt>
+          <dt class="col-sm-1"><code>?</code></dt>
+          <dd class="col-sm-11">Show this help modal</dd>
+          <dt class="col-sm-1"><code>/</dt>
+          <dd class="col-sm-11">Focus on search field</dd>
         </dl>
       </div>
     </div>

tests/Controller/MessengerControllerTest.php

@@ -54,10 +54,13 @@ public function testEmail()
         $testUser = $userRepository->findOneByEmail('communications.manager@example.com');
         $client->loginUser($testUser);
 
-        $client->request('GET', '/messenger/email');
+        $crawler = $client->request('GET', '/messenger/email');
         $this->assertResponseIsSuccessful();
         $this->assertPageTitleSame('Member Directory - Messenger - Email');
         $this->assertSelectorTextContains('span.display-6', 'Send Bulk Email');
+        $this->assertStringContainsString('Cox, Lucian (1-0007)', $crawler->filter('#member_email_recipients')->html());
+        $this->assertStringNotContainsString('Wallace, Bill (1-0004)', $crawler->filter('#member_email_recipients')->html());
+        $this->assertStringNotContainsString('(1-0013)', $crawler->filter('#member_email_recipients')->html());
     }
 
     public function testSms()
@@ -67,9 +70,12 @@ public function testSms()
         $testUser = $userRepository->findOneByEmail('communications.manager@example.com');
         $client->loginUser($testUser);
 
-        $client->request('GET', '/messenger/sms');
+        $crawler = $client->request('GET', '/messenger/sms');
         $this->assertResponseIsSuccessful();
         $this->assertPageTitleSame('Member Directory - Messenger - SMS');
         $this->assertSelectorTextContains('span.display-6', 'Send Bulk SMS');
+        $this->assertStringContainsString('Jenkens, Carter (1-0001)', $crawler->filter('#member_sms_recipients')->html());
+        $this->assertStringNotContainsString('Gaw, Ben (1-0002)', $crawler->filter('#member_sms_recipients')->html());
+        $this->assertStringNotContainsString('(1-0013)', $crawler->filter('#member_sms_recipients')->html());
     }
 }