Added a notifications field in the people table

Updates #144
City-of-Bloomington · Apr 27, 2018 · 6aac1f4 · 6aac1f4
1 parent 12c46c9
commit 6aac1f4
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 31 deletions.
diff --git a/blocks/html/account/info.inc b/blocks/html/account/info.inc
@@ -12,6 +12,7 @@ foreach ($fields as $f) {
     $get = 'get'.ucfirst($f);
     $$f  = parent::escape($this->person->$get());
 }
+$notifications = $this->person->getNotifications() ? $this->_('yes') : $this->_('no');
 ?>
 <section>
     <header>
@@ -32,12 +33,14 @@ foreach ($fields as $f) {
 
 
     <table>
-        <tr><th><?= $this->_('firstname' ); ?></th><td><?= $firstname;  ?></th></tr>
-        <tr><th><?= $this->_('lastname'  ); ?></th><td><?= $lastname;   ?></th></tr>
-        <tr><th><?= $this->_('department'); ?></th><td><?= $department; ?></th></tr>
-        <tr><th><?= $this->_('email'     ); ?></th><td><?= $email;      ?></th></tr>
-        <tr><th><?= $this->_('phone'     ); ?></th><td><?= $phone;      ?></th></tr>
-        <tr><th><?= $this->_('username'  ); ?></th><td><?= $username;   ?></th></tr>
+        <tr><th><?= $this->_('firstname'    ); ?></th><td><?= $firstname;     ?></th></tr>
+        <tr><th><?= $this->_('lastname'     ); ?></th><td><?= $lastname;      ?></th></tr>
+        <tr><th><?= $this->_('department'   ); ?></th><td><?= $department;    ?></th></tr>
+        <tr><th><?= $this->_('email'        ); ?></th><td><?= $email;         ?></th></tr>
+        <tr><th><?= $this->_('phone'        ); ?></th><td><?= $phone;         ?></th></tr>
+        <tr><th><?= $this->_('username'     ); ?></th><td><?= $username;      ?></th></tr>
+        <tr><th><?= $this->_('notifications'); ?></th><td><?= $notifications; ?></th></tr>
+    </table>
     </table>
 
 </section>
diff --git a/blocks/html/people/info.inc b/blocks/html/people/info.inc
@@ -12,6 +12,7 @@ foreach ($fields as $f) {
     $get = 'get'.ucfirst($f);
     $$f  = $this->person->$get();
 }
+$notifications = $this->person->getNotifications() ? $this->_('yes') : $this->_('no');
 
 $return_url = Url::current_url(BASE_HOST);
 $h = $this->template->getHelper('buttonLink');
@@ -39,9 +40,10 @@ if (Person::isAllowed('people', 'update')) {
         <div class="tools"><?= $editButton; ?></div>
     </header>
     <table>
-        <tr><th><?= $this->_('department'); ?></th><td><?= $department; ?></th></tr>
-        <tr><th><?= $this->_('email'     ); ?></th><td><?= $email;      ?></th></tr>
-        <tr><th><?= $this->_('phone'     ); ?></th><td><?= $phone;      ?></th></tr>
-        <tr><th><?= $this->_('username'  ); ?></th><td><?= $username;   ?></th></tr>
+        <tr><th><?= $this->_('department'   ); ?></th><td><?= $department;    ?></th></tr>
+        <tr><th><?= $this->_('email'        ); ?></th><td><?= $email;         ?></th></tr>
+        <tr><th><?= $this->_('phone'        ); ?></th><td><?= $phone;         ?></th></tr>
+        <tr><th><?= $this->_('username'     ); ?></th><td><?= $username;      ?></th></tr>
+        <tr><th><?= $this->_('notifications'); ?></th><td><?= $notifications; ?></th></tr>
     </table>
 </section>
diff --git a/blocks/html/people/partials/personInfoFields.inc b/blocks/html/people/partials/personInfoFields.inc
@@ -6,7 +6,7 @@
  */
 declare (strict_types=1);
 
-$fields = ['firstname', 'lastname', 'email', 'phone'];
+$fields = ['firstname', 'lastname', 'email', 'phone', 'notifications'];
 foreach ($fields as $f) {
 	$get = 'get'.ucfirst($f);
 	$$f = parent::escape($this->person->$get());
@@ -48,3 +48,16 @@ echo $h->field([
     'type'     => 'tel',
     'attr'     => ['inputmode'=>'tel']
 ]);
+
+$options = [
+    ['value'=>1, 'label'=>$this->_('yes')],
+    ['value'=>0, 'label'=>$this->_('no' )]
+];
+echo $h->field([
+    'name'     => 'notifications',
+    'id'       => 'notifications',
+    'label'    => $this->_('notifications'),
+    'value'    => $notifications,
+    'type'     => 'select',
+    'options'  => $options
+]);
diff --git a/scripts/migrations/1.1-1.2/databaseChanges.sql b/scripts/migrations/1.1-1.2/databaseChanges.sql
@@ -1,2 +1,3 @@
 alter table eventTypes add cifsType varchar(128);
-alter table events add foreign key (eventType_id) references eventTypes(id);
+alter table events     add foreign key (eventType_id) references eventTypes(id);
+alter table people     add notifications boolean;
diff --git a/scripts/mysql.sql b/scripts/mysql.sql
@@ -8,16 +8,17 @@ create table departments (
 );
 
 create table people (
-	id int unsigned not null primary key auto_increment,
-	firstname varchar(128) not null,
-	lastname  varchar(128) not null,
-	email     varchar(255) not null,
-	phone     varchar(16),
-	username  varchar(40) unique,
-	password  varchar(40),
+	id                   int unsigned not null primary key auto_increment,
+	department_id        int unsigned,
+	firstname            varchar(128) not null,
+	lastname             varchar(128) not null,
+	email                varchar(255) not null,
+	phone                varchar(16),
+	username             varchar(40) unique,
+	password             varchar(40),
 	authenticationMethod varchar(40),
-	role varchar(30),
-	department_id int unsigned,
+	role                 varchar(30),
+	notifications        boolean
 	foreign key (department_id) references departments(id)
 );
 

diff --git a/src/Models/PeopleTable.php b/src/Models/PeopleTable.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * @copyright 2013 City of Bloomington, Indiana
+ * @copyright 2014-2018 City of Bloomington, Indiana
  * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt
- * @author Cliff Ingham <[email protected]>
  */
 namespace Application\Models;
 
@@ -34,6 +33,11 @@ public function find($fields=null, $order='lastname', $paginated=false, $limit=n
 						}
 					break;
 
+					case 'notifications':
+                        if ($value) { $select->where('notifications =  1'); }
+                        else        { $select->where('notifications != 1'); }
+					break;
+
 					default:
 						$select->where([$key=>$value]);
 				}

diff --git a/src/Models/Person.php b/src/Models/Person.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * @copyright 2009-2015 City of Bloomington, Indiana
+ * @copyright 2009-2018 City of Bloomington, Indiana
  * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt
- * @author Cliff Ingham <[email protected]>
  */
 namespace Application\Models;
 use Blossom\Classes\ActiveRecord;
@@ -96,9 +95,7 @@ public function save()
 	 */
 	public function deleteUserAccount()
 	{
-		$userAccountFields = array(
-			'username', 'password', 'authenticationMethod', 'role'
-		);
+		$userAccountFields = ['username', 'password', 'authenticationMethod', 'role'];
 		foreach ($userAccountFields as $f) {
 			$this->data[$f] = null;
 		}
@@ -123,12 +120,14 @@ public function getUsername()             { return parent::get('username'); }
 	public function getPassword()             { return parent::get('password'); } # Encrypted
 	public function getRole()                 { return parent::get('role');     }
 	public function getAuthenticationMethod() { return parent::get('authenticationMethod'); }
+    public function getNotifications(): int   { return parent::get('notifications') ? 1 : 0; }
 	public function getDepartment_id()        { return parent::get('getDepartment_id'); }
     public function getDepartment() { return parent::getForeignKeyObject(__namespace__.'\Department', 'department_id'); }
 
 	public function setUsername            ($s) { parent::set('username',             $s); }
 	public function setRole                ($s) { parent::set('role',                 $s); }
 	public function setAuthenticationMethod($s) { parent::set('authenticationMethod', $s); }
+	public function setNotifications       ($b) { parent::set('notifications', $b ? 1 : 0); }
     public function setDepartment_id($i) { parent::setForeignKeyField (__namespace__.'\Department', 'department_id', $i); }
     public function setDepartment   ($i) { parent::setForeignKeyObject(__namespace__.'\Department', 'department_id', $i); }
 
@@ -144,7 +143,7 @@ public function setPassword($s)
 	 */
 	public function handleUpdate($post)
 	{
-		$fields = array( 'firstname', 'middlename', 'lastname', 'email', 'phone' );
+		$fields = ['firstname', 'middlename', 'lastname', 'email', 'phone', 'notifications'];
 		foreach ($fields as $field) {
 			if (isset($post[$field])) {
 				$set = 'set'.ucfirst($field);
@@ -158,10 +157,10 @@ public function handleUpdate($post)
 	 */
 	public function handleUpdateUserAccount($post)
 	{
-		$fields = array(
+		$fields = [
 			'firstname', 'lastname', 'email', 'phone', 'department_id',
 			'username', 'authenticationMethod', 'role'
-		);
+		];
 
 		foreach ($fields as $f) {
 			if (isset($post[$f])) {
@@ -277,4 +276,5 @@ public function populateFromExternalIdentity(ExternalIdentity $identity)
             $this->setPhone($identity->getPhone());
 		}
 	}
+
 }