Changeset 541 for trunk/phpbms/include

Timestamp:

05/28/09 13:08:01 (3 years ago)

Author:

brieb

Message:

* Added UUID display to add edit screens. Started move of Id display to bottom.

Location:

trunk/phpbms/include

Files:

• common_functions.php (modified) (3 diffs)
• fields.php (modified) (3 diffs)
• tables.php (modified) (3 diffs)

trunk/phpbms/include/common_functions.php

@@ -180 +180 @@
 //Most Common Functions of the Application go here.
 //=================================================
+
+/**
+  * generates a Universal Unique ID (UUID) with an optional prefix
+  *
+  * @param string $prefix prefix to prepend to the UUID
+  */
 function uuid($prefix = ''){
 
@@ -203 +209 @@
 }
 
+
 function goURL($url){
         if(headers_sent())
@@ -209 +216 @@
         exit;
 }
+
 
 function hasRights($roleid,$fullAccessAdmin = true){

trunk/phpbms/include/fields.php

@@ -96 +96 @@
     // Displays the bottom record details that are present on almost all phpBMS
     // records.  These are non-modifiable
-    function showCreateModify($phpbms, $therecord){
+    function showGeneralInfo($phpbms, $therecord){
         ?>
 <div id="createmodifiedby" >
-    <div id="savecancel2"><?php showSaveCancel(2)?></div>
     <table>
         <tbody>
-            <tr id="cmFirstRow">
+            <tr class="topRows">
                 <td class="cmTitles">
                         <input name="createdby" type="hidden" value="<?php $therecord["createdby"] ?>" />
@@ -110 +109 @@
                 <td><?php echo htmlQuotes($phpbms->getUserName($therecord["createdby"]))?></td>
                 <td><?php echo formatFromSQLDatetime($therecord["creationdate"]) ?></td>
+                <td id="cmButtonContainer" rowspan="3">
+                    <?php showSaveCancel(2)?>
+                </td>
             </tr>
-            <tr>
+            <tr class="topRows">
                 <td class="cmTitles">
                         <input name="modifiedby" type="hidden" value="<?php $therecord["modifiedby"] ?>" />
@@ -121 +123 @@
                 <td><?php echo formatFromSQLDatetime($therecord["modifieddate"]) ?></td>
             </tr>
+            <tr>
+                <td class="cmTitles">
+                        uuid / id
+                        <input name="uuid" id="uuid" type="hidden" value="<?php if(isset($therecord["uuid"])) echo $therecord["uuid"] ?>" />
+                        <input id="id" name="id" type="hidden" value="<?php echo $therecord["id"]?>" />
+                </td>
+                <td colspan="2" id="cmIds"><span><?php echo isset($therecord["uuid"])?$therecord["uuid"]:'&nbsp;' ?></span><span id="cmId"><?php echo $therecord["id"] ?></span></td>
+            </tr>
         </tbody>
     </table>
 </div>
         <?php
-    }//end function showCreateModify
+    }//end function showGeneralInfo
 
 

trunk/phpbms/include/tables.php

@@ -49 +49 @@
         var $fields = array();
 
+
         function phpbmsTable($db,$tabledefid = 0,$backurl = NULL){
 
@@ -286 +287 @@
 
 
-        // retrieves default values for record
-        // uses the field name to retrieve the default value, and if it does not
-        // match one the predefined phpBMS names (such as id, or modified by)
-        // it uses the field type
+        /**
+          * Retrieves default values for a single record
+          *
+          * Uses the field names to guess a default value.  If it cannot find
+          * one of the standard names it sets the default value based on the type
+          *
+          */
         function getDefaults(){
 
@@ -298 +302 @@
                 switch($fieldname){
 
-                        case "id":
-                        case "modifiedby":
-                        case "modifieddate":
+                    case "id":
+                    case "modifiedby":
+                    case "modifieddate":
+                        $therecord[$fieldname] = NULL;
+                        break;
+
+                    case "uuid":
+                        $therecord["uuid"] = uuid($this->prefix.":");
+                        break;
+
+                    case "createdby":
+                        $therecord["createdby"] = $_SESSION["userinfo"]["id"];
+                        break;
+
+                    default:
+                        if(strpos($thefield["flags"],"not_null") === false)
                             $therecord[$fieldname] = NULL;
-                            break;
-
-                        case "createdby":
-                            $therecord["createdby"] = $_SESSION["userinfo"]["id"];
-                            break;
-
-                        default:
-                            if(strpos($thefield["flags"],"not_null") === false)
-                                $therecord[$fieldname] = NULL;
-                            else
-                                $therecord[$fieldname] = $this->getDefaultByType($thefield["type"]);
-
-                            break;
+                        else
+                            $therecord[$fieldname] = $this->getDefaultByType($thefield["type"]);
+
+                        break;
 
                 }//endswitch