Changeset 687

Timestamp:

08/13/05 01:16:22 (8 years ago)

Author:

fproulx

Message:

2005-08-12 Francois Proulx <francois.proulx@…>

• Added missing GisPoint? fille to CVS
• Fixed some bugs
• Added Technical officer table
• Added technical officer management to node UI

Location:

trunk/wifidog-auth

Files:

• .project (added)
• ChangeLog (modified) (1 diff)
• wifidog (modified) (1 prop)
• wifidog/.cvsignore (modified) (1 diff)
• wifidog/classes/GisPoint.php (added)
• wifidog/classes/Node.php (modified) (8 diffs)
• wifidog/include/schema_validate.php (modified) (2 diffs)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-08-12 Francois Proulx <francois.proulx@gmail.com>
+        * Added missing GisPoint fille to CVS
+        * Fixed some bugs
+        * Added Technical officer table
+        * Added technical officer management to node UI
+        
 2005-08-12 Francois Proulx <francois.proulx@gmail.com>
         * Changed config.php GMAPS_API_KEY to GMAPS_PUBLIC_API_KEY

trunk/wifidog-auth/wifidog

@@ -1 +1 @@
 *~
+local.config.php

@@ -1 +1 @@
 *~
+local.config.php

trunk/wifidog-auth/wifidog/.cvsignore

@@ -1 +1 @@
 *~
+local.config.php

trunk/wifidog-auth/wifidog/classes/Node.php

@@ -677 +677 @@
                  * Simply use a geocoding service.
                  */
-                 /*
+                 
                 if(defined('GMAPS_HOTSPOTS_MAP_ENABLED') && GMAPS_HOTSPOTS_MAP_ENABLED === true)
                 {
@@ -688 +688 @@
                 }
                 else
-                {*/
+                {
                         $html .= "<div class='admin_section_container'>\n";     
                         $html .= "<div class='admin_section_data'>\n";
@@ -695 +695 @@
                         $html .= "</div>\n";
                         $html .= "</div>\n";
-                //}
+                }
                 
                 // End of GIS data
@@ -728 +728 @@
                 $html .= "</div>\n";
                 $html .= "</div>\n";
+                
+                // Tech officers management
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Technical officers")." : </div>\n";
+                $html .= "<ul class='admin_section_list'>\n";
+                foreach ($this->getTechnicalOfficers() as $tech_officer)
+                {
+                        $html .= "<li class='admin_section_list_item'>\n";
+                        $html .= "<div class='admin_section_data'>\n";
+                        $html .= "{$tech_officer->getUsername()}";
+                        $html .= "</div>\n";
+                        $html .= "<div class='admin_section_tools'>\n";
+                        $name = "node_{$this->getId()}_tech_officer_{$tech_officer->GetId()}_remove";
+                        $html .= "<input type='submit' name='$name' value='"._("Remove technical officer")."'>";
+                        $html .= "</div>\n";
+                        $html .= "</li>\n";
+                }
+                $html .= "<li class='admin_section_list_item'>\n";
+                $name = "node_{$this->getId()}_new_tech_officer";
+                $html .= User :: getSelectUserUI($name);
+                $name = "node_{$this->getId()}_new_tech_officer_submit";
+                $html .= "<input type='submit' name='$name' value='"._("Add technical officer")."'>";
+                $html .= "</li>\n";
+                $html .= "</ul>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
 
                 // Display stats
@@ -878 +904 @@
                         }
                 }
-
-                $name = "node_{$this->getId()}_new_owner_submit";
+                
+                // Technical officers processing
+                // Rebuild user id, and delete if it was selected
+                foreach ($this->getTechnicalOfficers() as $tech_officer)
+                {
+                        $name = "node_{$this->getId()}_tech_officer_{$tech_officer->GetId()}_remove";
+                        if (!empty ($_REQUEST[$name]))
+                        {
+                                if ($this->isTechnicalOfficer($tech_officer))
+                                        $this->removeTechnicalOfficer($tech_officer);
+                                else
+                                        echo _("Invalid user!");
+                        }
+                }
+
+                $name = "node_{$this->getId()}_new_tech_officer_submit";
                 if (!empty ($_REQUEST[$name]))
                 {
-                        $name = "node_{$this->getId()}_new_owner";
-                        $owner = User :: processSelectUserUI($name);
-                        if ($owner)
-                        {
-                                if ($this->isOwner($owner))
-                                        echo _("The user is already an owner of this node.");
+                        $name = "node_{$this->getId()}_new_tech_officer";
+                        $tech_officer = User :: processSelectUserUI($name);
+                        if ($tech_officer)
+                        {
+                                if ($this->isTechnicalOfficer($tech_officer))
+                                        echo _("The user is already a technical officer of this node.");
                                 else
-                                        $this->addOwner($owner);
+                                        $this->addTechnicalOfficer($tech_officer);
                         }
                 }
@@ -1076 +1116 @@
                 return $retval;
         }
-
-        function addOwner($user)
+        
+        function getTechnicalOfficers()
+        {
+                global $db;
+                $retval = array ();
+                $db->ExecSql("SELECT user_id FROM node_tech_officers WHERE node_id='{$this->id}'", $officers, false);
+                if ($officers != null)
+                {
+                        foreach ($officers as $officer_row)
+                        {
+                                $retval[] = User :: getObject($officer_row['user_id']);
+                        }
+                }
+                return $retval;
+        }
+
+        /** Associates an owner to this node
+         * @param User
+         */
+        function addOwner(User $user)
         {
                 global $db;
@@ -1083 +1141 @@
                         throw new Exception(_('Could not add owner'));
         }
-
-        function removeOwner($user)
+        
+        /** Associates a technical officer ( tech support ) to this node
+         * @param User
+         */
+        function addTechnicalOfficer(User $user)
+        {
+                global $db;
+                if (!$db->ExecSqlUpdate("INSERT INTO node_tech_officers (node_id, user_id) VALUES ('{$this->getId()}','{$user->getId()}')", false))
+                        throw new Exception(_('Could not add technical officer'));
+        }
+
+        /** Remove a technical officer ( tech support ) from this node
+         * @param User
+         */
+        function removeOwner(User $user)
         {
                 global $db;
                 if (!$db->ExecSqlUpdate("DELETE FROM node_owners WHERE node_id='{$this->getId()}' AND user_id='{$user->getId()}'", false))
+                        throw new Exception(_('Could not remove owner'));
+        }
+        
+        /** Remove a technical officer ( tech support ) from this node
+         * @param User
+         */
+        function removeTechnicalOfficer(User $user)
+        {
+                global $db;
+                if (!$db->ExecSqlUpdate("DELETE FROM node_tech_officers WHERE node_id='{$this->getId()}' AND user_id='{$user->getId()}'", false))
                         throw new Exception(_('Could not remove owner'));
         }
@@ -1108 +1189 @@
                 return $retval;
         }
+        
+        /** Is the user a technical officer of the Node? 
+         * @return true our false*/
+        function isTechnicalOfficer(User $user)
+        {
+                global $db;
+                if ($user != null)
+                {
+                        $user_id = $user->getId();
+                        $retval = false;
+                        $db->ExecSqlUniqueRes("SELECT * FROM node_tech_officers WHERE node_id='{$this->id}' AND user_id='{$user_id}'", $row, false);
+                        if ($row != null)
+                        {
+                                $retval = true;
+                        }
+                }
+                return $retval;
+        }
 
         function nodeExists($id)

trunk/wifidog-auth/wifidog/include/schema_validate.php

@@ -28 +28 @@
 require_once BASEPATH.'classes/AbstractDb.php';
 require_once BASEPATH.'classes/Session.php';
-define('REQUIRED_SCHEMA_VERSION', 22);
+define('REQUIRED_SCHEMA_VERSION', 23);
 
 /** Check that the database schema is up to date.  If it isn't, offer to update it. */
@@ -515 +515 @@
                         $sql .= "ALTER TABLE nodes ADD COLUMN postal_code text;\n";
                 }
+                
+                $new_schema_version = 23;
+                if ($schema_version < $new_schema_version)
+                {
+                        echo "<h2>Preparing SQL statements to update schema to version  $new_schema_version</h2>\n";
+                        $sql .= "\n\nUPDATE schema_info SET value='$new_schema_version' WHERE tag='schema_version';\n";
+                        $sql .= "CREATE TABLE node_tech_officers (\n";
+                        $sql .= "  node_id VARCHAR(32) REFERENCES nodes (node_id),\n";
+                        $sql .= "  user_id VARCHAR(45) REFERENCES users (user_id),\n";
+                        $sql .= "PRIMARY KEY (node_id, user_id)\n";
+                        $sql .= ");\n";
+                }
 
                 $db->ExecSqlUpdate("BEGIN;\n$sql\nCOMMIT;\n", true);

@@ -1 +1 @@
 *~
+local.config.php