pending merges:

Brad Shuttleworth 2006-04-07 fix for fieldset overviews. Brad Shuttleworth 2006-04-07 KTS-644: Add overview & test to conditional... Brad Shuttleworth 2006-04-07 KTS-453: show types and fieldsets on respe... Brad Shuttleworth 2006-04-07 merge in. Brad Shuttleworth 2006-04-07 KTS-747: invalid role-allocation lookup git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5218 c91229c3-7414-0410-bfa2-8a42b809f60b

pending merges:
Brad Shuttleworth 2006-04-07 fix for fieldset overviews. Brad Shuttleworth 2006-04-07 KTS-644: Add overview & test to conditional... Brad Shuttleworth 2006-04-07 KTS-453: show types and fieldsets on respe... Brad Shuttleworth 2006-04-07 merge in. Brad Shuttleworth 2006-04-07 KTS-747: invalid role-allocation lookup git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5218 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent 4a48788e
Showing 9 changed files with 295 additions and 6 deletions
lib/metadata/fieldset.inc.php
lib/roles/roleallocation.inc.php
plugins/ktcore/admin/documentFields.php
plugins/ktcore/admin/documentTypes.php
resources/js/conditional_usage.js
templates/ktcore/documenttypes/list.smarty
templates/ktcore/metadata/conditional/conditional_overview.smarty
templates/ktcore/metadata/conditional/conditional_rename_behaviours.smarty
templates/ktcore/metadata/listFieldsets.smarty
@@ -161,6 +161,27 @@ class KTFieldset extends KTEntity {
         }
         return $aRet;
     }
+	
+	function &getAssociatedTypes() {
+	    // NOTE:  this returns null if we are generic (all is the wrong answer)
+		if ($this->getIsGeneric()) { return null; }
+		
+		$sTable = KTUtil::getTableName('document_type_fieldsets');
+        $aQuery = array(
+            "SELECT document_type_id FROM $sTable WHERE fieldset_id = ?",
+            array($this->getId()),
+        );
+        $aIds = DBUtil::getResultArrayKey($aQuery, 'document_type_id');
+		
+		$aRet = array();
+		foreach ($aIds as $iID) {
+		    $oType = DocumentType::get($iID);
+			if (!PEAR::isError($oType)) { 
+			    $aRet[] = $oType;
+			}
+		}
+		return $aRet;
+	}
     function &getFields() {
         return DocumentField::getByFieldset($this);
@@ -110,7 +110,7 @@ class RoleAllocation extends KTEntity {
 		' LEFT JOIN ' . $fTable . ' AS f ON (f.id = ra.folder_id) ' .
 		' WHERE f.id IN ' . $folders .
 		' AND ra.role_id = ?' .
-		' ORDER BY CHAR_LENGTH(f.parent_folder_ids) desc, f.parent_folder_ids DESC; ';
+		' ORDER BY CHAR_LENGTH(f.parent_folder_ids) desc, f.parent_folder_ids DESC';
 		$aParams = array($iRoleId);
 		$aRoleAllocIds = DBUtil::getResultArrayKey(array($sQuery, $aParams), 'id');
@@ -61,6 +61,7 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
         $oTemplating =& KTTemplating::getSingleton();
         $oTemplate =& $oTemplating->loadTemplate('ktcore/metadata/listFieldsets');
         $oTemplate->setData(array(
+		    'context' => $this,
             'fieldsets' => KTFieldset::getList(),
             'creation_fields' => $createFields,
         ));
@@ -68,6 +69,25 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
     }
     // }}}
+	function getTypesForFieldset($oFieldset) {
+	    if ($oFieldset->getIsGeneric()) {
+		    return _kt('All types use this generic fieldset.');
+		}
+		
+	    $types = $oFieldset->getAssociatedTypes();
+		if (PEAR::isError($types)) {
+		    return _kt('Error retrieving list of types.');
+		}
+		if (empty($types)) { 
+		    return _kt('None');
+		}
+		$aNames = array();
+		foreach ($types as $oType) { 
+		    $aNames[] = $oType->getName();
+		}
+		return implode(', ', $aNames);
+	}
+
     // {{{ do_edit
     function do_edit() {
         $this->oPage->setBreadcrumbDetails("edit");    
@@ -872,6 +892,122 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
         $actionStr .= ")";
         return $actionStr;
     }
+	
+	
+    function do_viewOverview() {
+        $fieldset_id = KTUtil::arrayGet($_REQUEST, "fieldset_id");
+        $oTemplating =& KTTemplating::getSingleton();
+        $oTemplate = $oTemplating->loadTemplate("ktcore/metadata/conditional/conditional_overview");
+
+        
+        $oFieldset =& KTFieldset::get($fieldset_id);
+        $aFields =& $oFieldset->getFields();
+        
+        $aBehaviours = array();
+		foreach ($aFields as $oField) {
+		    $aOpts = KTFieldBehaviour::getByField($oField);
+		    $aBehaviours = kt_array_merge($aBehaviours, $aOpts);
+		}
+        
+        $aTemplateData = array(
+            "context" => &$this,
+            "fieldset_id" => $fieldset_id,
+            "aFields" => $aFields,
+			"behaviours" => $aBehaviours,
+            "iMasterFieldId" => $oFieldset->getMasterFieldId(),
+        );
+        return $oTemplate->render($aTemplateData);
+    }
+	
+	function getSetsForBehaviour($oBehaviour, $fieldset_id) {
+	    $oFieldset = KTFieldset::get($fieldset_id);
+		if (is_null($oBehaviour)) {
+		    $fid = $oFieldset->getMasterFieldId();
+			$aQuery = array(
+			    sprintf('SELECT df.name as field_name, ml.name as lookup_name, fb.id as behaviour_id, fb.name as behaviour_name FROM 
+				    %s as fvi
+					LEFT JOIN %s as fb ON (fvi.behaviour_id = fb.id) 
+					LEFT JOIN %s AS df ON (fvi.field_id = df.id) 
+					LEFT JOIN metadata_lookup AS ml ON (fvi.field_value_id = ml.id) 
+					WHERE fvi.field_id = ?
+					ORDER BY df.name ASC, ml.name ASC', 
+					KTUtil::getTableName('field_value_instances'),
+					KTUtil::getTableName('field_behaviours'),
+					KTUtil::getTableName('document_fields'),
+					KTUtil::getTableName('metadata')),
+				array($fid),
+			);
+			$res = DBUtil::getResultArray($aQuery);
+			return $res;
+		} else {
+		    $bid = $oBehaviour->getId();
+			$aQuery = array(
+			    sprintf('SELECT df.name as field_name, ml.name as lookup_name, fb.id as behaviour_id, fb.name as behaviour_name FROM 
+			        %s AS fbo 
+					LEFT JOIN %s as fvi ON (fbo.instance_id = fvi.id) 
+					LEFT JOIN %s as fb ON (fvi.behaviour_id = fb.id) 
+					LEFT JOIN %s AS df ON (fvi.field_id = df.id) 
+					LEFT JOIN metadata_lookup AS ml ON (fvi.field_value_id = ml.id) 
+					WHERE fbo.behaviour_id = ?
+					ORDER BY df.name ASC, ml.name ASC', 
+					KTUtil::getTableName('field_behaviour_options'),
+					KTUtil::getTableName('field_value_instances'),
+					KTUtil::getTableName('field_behaviours'),
+					KTUtil::getTableName('document_fields'),
+					KTUtil::getTableName('metadata')),
+				array($bid),
+			);
+			
+			$res = DBUtil::getResultArray($aQuery);
+			return $res;
+		}
+
+		return $aNextFieldValues;
+	}
+	
+	function do_renameBehaviours() {
+        $fieldset_id = KTUtil::arrayGet($_REQUEST, "fieldset_id");
+        $oTemplating =& KTTemplating::getSingleton();
+        $oTemplate = $oTemplating->loadTemplate("ktcore/metadata/conditional/conditional_rename_behaviours");
+
+        
+        $oFieldset =& KTFieldset::get($fieldset_id);
+        $aFields =& $oFieldset->getFields();
+        
+        $aBehaviours = array();
+		foreach ($aFields as $oField) {
+		    $aOpts = KTFieldBehaviour::getByField($oField);
+		    $aBehaviours = kt_array_merge($aBehaviours, $aOpts);
+		}
+        
+        $aTemplateData = array(
+            "context" => &$this,
+            "fieldset_id" => $fieldset_id,
+			"behaviours" => $aBehaviours,
+        );
+        return $oTemplate->render($aTemplateData);
+    }
+	
+	function do_finalRename() {
+        $fieldset_id = KTUtil::arrayGet($_REQUEST, "fieldset_id");
+	    $aRenamed = (array) KTUtil::arrayGet($_REQUEST, "renamed");
+				
+		$this->startTransaction(); 
+		
+		foreach ($aRenamed as $bid => $new_name) {
+			$oBehaviour = KTFieldBehaviour::get($bid);
+			if (PEAR::isError($oBehaviour)) { continue; } // skip it...
+			$oBehaviour->setName(trim($new_name));
+			$res = $oBehaviour->update();
+			if (PEAR::isError($res)) { 
+			    $this->errorRedirectToMain(_kt('Failed to change name of behaviour.'), sprintf('action=edit&fFieldsetId=%s',$fieldset_id)); 
+			}
+		}
+		
+		$this->successRedirectToMain(_kt('Names changed.'), sprintf('action=edit&fFieldsetId=%s', $fieldset_id));
+	}
+	
+
 // }}}
 }
@@ -51,6 +51,7 @@ class KTDocumentTypeDispatcher extends KTAdminDispatcher {
         $oTemplating =& KTTemplating::getSingleton();
         $oTemplate = $oTemplating->loadTemplate('ktcore/documenttypes/list');
         $oTemplate->setData(array(
+             'context' => $this,
             'document_types' => DocumentType::getList(),
             'add_fields' => $addFields,
         ));
@@ -151,6 +152,7 @@ class KTDocumentTypeDispatcher extends KTAdminDispatcher {
         $this->oPage->setBreadcrumbDetails(_kt('edit'));
         $oTemplate->setData(array(
+            'context' => $this,
             'oDocumentType' => $oDocumentType,
             'aCurrentFieldsets' => $aCurrentFieldsets,
             'aAvailableFieldsets' => $aAvailableFieldsets,
@@ -210,6 +212,22 @@ class KTDocumentTypeDispatcher extends KTAdminDispatcher {
         $this->successRedirectTo('edit', _kt('Fieldsets associated.'), 'fDocumentTypeId=' . $oDocumentType->getId());
         exit(0);
     }
+
+    function getFieldsetsForType($oType) {
+        $aCurrentFieldsets = KTFieldset::getForDocumentType($oType);
+        if (empty($aCurrentFieldsets)) { 
+            return _kt('No fieldsets');
+        } 
+        
+        $aNames = array();
+        foreach ($aCurrentFieldsets as $oFieldset) {
+            if (!PEAR::isError($oFieldset)) { 
+                $aNames[] = $oFieldset->getName();
+            }
+        }
+        
+        return implode(', ', $aNames);
+    }
 }
 ?>
@@ -138,6 +138,7 @@ function createFixedWidget(fieldset, widget, i_name, i_value, i_label) {
         return false;
     }
     var header = widget.getElementsByTagName('LABEL')[0];  // FIXME _could_ fail if pathalogical.
+	header.removeChild(header.getElementsByTagName('SPAN')[0]);
     var i_friendly_name = scrapeText(header);
     var newWidget = DIV({'class':'field fixed'},
@@ -345,7 +346,7 @@ function reviseConditional(buttonsource) {
  */
 function initialiseConditionalFieldsets() {
-    simpleLog('ERROR','incomplete function called: initialiseFieldsets.');
+    
     var fieldsets = getElementsByTagAndClassName('FIELDSET','conditional_metadata');
     simpleLog('DEBUG','found fieldsets: '+fieldsets.length);
     // triggers initial update - since this contains no "fixed" vars, it'll remove "unfixed" widgets 
@@ -27,11 +27,12 @@ please enter a name for the type below.{/i18n}&lt;/p&gt;
 its details, or click on the delete button to remove it from the
 system.{/i18n}</p>
-<table class="listing" cellspacing="0" cellpadding="0">
+<table class="kt_collection narrow" cellspacing="0" cellpadding="5">
   <thead>
     <tr>
       <th colspan="3">{i18n}Document Type{/i18n}</th>
+      <th>{i18n}Fieldsets{/i18n}</th>
     </tr>
   </thead>
@@ -46,17 +47,20 @@ system.{/i18n}&lt;/p&gt;
 </td>
 <td>
-    <a href="{addQS}action=edit&fDocumentTypeId={$oDocumentType->getId()}{/addQS}">{i18n}Edit{/i18n}</a>
+    <a class="ktAction ktEdit" href="{addQS}action=edit&fDocumentTypeId={$oDocumentType->getId()}{/addQS}">{i18n}Edit{/i18n}</a>
 </td>
 <td>
 {if $oDocumentType->getDisabled()}
-    <a href="{addQS}action=enable&fDocumentTypeId={$oDocumentType->getId()}{/addQS}">{i18n}Enable{/i18n}</a>
+    <a class="ktAction ktEnable" href="{addQS}action=enable&fDocumentTypeId={$oDocumentType->getId()}{/addQS}">{i18n}Enable{/i18n}</a>
 {else}
-    <a href="{addQS}action=disable&fDocumentTypeId={$oDocumentType->getId()}{/addQS}">{i18n}Disable{/i18n}</a>
+    <a class="ktAction ktDelete" href="{addQS}action=disable&fDocumentTypeId={$oDocumentType->getId()}{/addQS}">{i18n}Disable{/i18n}</a>
 {/if}
 </td>
+<td>
+   <span class="descriptiveText">{$context->getFieldsetsForType($oDocumentType)}</span>
+</td>
 </tr>
   </tbody>
+{$context->oPage->requireJSResource('thirdpartyjs/MochiKit/Base.js')}
+{$context->oPage->requireJSResource('thirdpartyjs/MochiKit/Async.js')}
+{$context->oPage->requireJSResource('thirdpartyjs/MochiKit/Iter.js')}
+{$context->oPage->requireJSResource('thirdpartyjs/MochiKit/DateTime.js')}
+{$context->oPage->requireJSResource('thirdpartyjs/MochiKit/DOM.js')}
+{$context->oPage->requireJSResource('resources/js/taillog.js')}
+{$context->oPage->requireJSResource('resources/js/conditional_usage.js')}
+
+<h2>{i18n}Conditional Metadata Overview{/i18n}</h2>
+
+<p class="descriptiveText">{i18n}Conditional Metadata is made up of fields, values
+and behaviours.  For a given behaviour, various values in other fields can be
+selected.  Depending on both the behaviour and the newly selected value, additional
+fields and values may be selected, which cause a new behaviour to be "active".{/i18n}</p>
+
+<fieldset class="conditional_metadata"><legend>{i18n}Test Instance{/i18n}</legend>
+<p class="descriptiveText">{i18n}For the majority of conditional cases, simply walking 
+through a test is sufficient.  You can do that below for the fieldset you have selected.{/i18n}</p>
+
+    <input type="hidden" class="fixed" name="fieldset" value="{$fieldset_id}" />
+    <p class="descriptiveText">
+        {$description}
+    </p>
+    
+    <div class="conditional_target">
+    {i18n}conditional data.{/i18n}
+    </div>
+
+
+</fieldset>
+
+<p class="descriptiveText">{i18n}These behaviours and the fields and values they allow
+are shown below for the active field.{/i18n}</p>
+
+<h3>Behaviours</h3>
+<p class="descriptiveText">{i18n}Clicking on a given behaviour below will show you
+which fields and values can be selected when the clicked behaviour is active.{/i18n}</p>
+<ul>
+<li><a href="#behaviour-null">No Active Behaviour (initial values)</a></li>
+{foreach from=$behaviours item=oBehaviour}
+<li><a href="#behaviour-{$oBehaviour->getId()}">{$oBehaviour->getName()}</a></li>
+{/foreach}
+</ul>
+
+<h4><a name="behaviour-null"></a>No Active Behaviour (initial values)</h4>
+
+{* this is a list of field rows ... see db. *}
+
+{foreach from=$context->getSetsForBehaviour(null, $fieldset_id) item=row}
+<span class="descriptiveText">Field:</span> {$row.field_name} &raquo; <span class="descriptiveText">Option:</span> {$row.lookup_name} &raquo;
+{if empty($row.behaviour_id)}
+   <span class="descriptiveText">no additional behaviours</span>
+{else}
+   <a href="#behaviour-{$row.behaviour_id}">{$row.behaviour_name}</a>
+{/if}
+<br />
+{/foreach}
+
+{foreach from=$behaviours item=oBehaviour}
+
+<h4><a name="behaviour-{$oBehaviour->getId()}"></a>{$oBehaviour->getName()}</h4>
+
+{* this is a list of field rows ... see db. *}
+
+{foreach from=$context->getSetsForBehaviour($oBehaviour, $fieldset_id) item=row}
+<span class="descriptiveText">Field:</span> {$row.field_name} &raquo; <span class="descriptiveText">Option:</span> {$row.lookup_name} &raquo;
+{if empty($row.behaviour_id)}
+   <span class="descriptiveText">no additional behaviours</span>
+{else}
+   <a href="#behaviour-{$row.behaviour_id}">{$row.behaviour_name}</a>
+{/if}
+<br />
+{/foreach}
+
+{/foreach}
 \ No newline at end of file
+<h2>{i18n}Rename Behaviours{/i18n}</h2>
+
+<p class="descriptiveText">{i18n}If you have converted a simple conditional fieldset to a complex one,
+it may be useful to rename some of the system-generated names.  You can do that here.{/i18n}</p>
+
+<form method="POST" action="{$smarty.server.PHP_SELF}">
+<table class="kt_collection narrow" cellspacing="0" cellpadding="5">
+<thead>
+    <tr>
+        <th>{i18n}Current Name{/i18n}</th>
+        <th>{i18n}New Name{/i18n}</th>
+    </tr>
+</thead>
+<tbody>
+    {foreach from=$behaviours item=oBehaviour}
+    <tr>
+        <td><strong>{$oBehaviour->getName()}</strong></td>
+        <td><input type="text" name="renamed[{$oBehaviour->getId()}]" value="{$oBehaviour->getName()}" size="40" /></td>
+    </tr>
+    {/foreach}
+</tbody>
+</table>
+
+<div class="form_actions">
+    <input type="hidden" name="action" value="finalRename" />
+    <input type="hidden" name="fieldset_id" value="{$fieldset_id}" />
+    <input type="submit" value="{i18n}Rename Behaviours{/i18n}" />
+</div>
+</form>
 \ No newline at end of file
@@ -14,6 +14,7 @@
       <th>{i18n}Fields{/i18n}</th>
 	  <th>{i18n}Edit{/i18n}</th>
 	  <th>{i18n}Delete{/i18n}</th>
+	  <th>{i18n}Document Types using this Fieldset{/i18n}</th>
     </tr>
   </thead>
   <tbody>
@@ -56,6 +57,10 @@
 	     <a href="{addQS}action=delete&fFieldsetId={$oFieldset->getId()}{/addQS}" class="ktAction ktDelete">{i18n}Delete{/i18n}</a>
 	  </td>
+	  <td>
+	     <span class="descriptiveText">{$context->getTypesForFieldset($oFieldset)}</span>
+	  </td>
+	  
     </tr>
   </tbody>
 {/foreach}