Author: sevein
Date: Mon Jun 27 22:19:42 2011
New Revision: 9204

Log:
Update accession module edit forms

Modified:
   
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editAction.class.php
   
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editSuccess.php
   
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php

Modified: 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editAction.class.php
==============================================================================
--- 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editAction.class.php
      Mon Jun 27 22:14:44 2011        (r9203)
+++ 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editAction.class.php
      Mon Jun 27 22:19:42 2011        (r9204)
@@ -22,7 +22,19 @@
   // Arrays not allowed in class constants
   public static
     $NAMES = array(
+      'acquisitionType',
+      'archivalHistory',
+      'condition',
+      'content',
+      'creator',
       'identifier',
+      'locationInformation',
+      'resourceType',
+      'processingNotes',
+      'processingPriority',
+      'processingStatus',
+      'receivedExtentUnits',
+      'sourceOfAcquisition',
       'title');
 
   public function earlyExecute()
@@ -47,7 +59,69 @@
   {
     switch ($name)
     {
+      case 'acquisitionType':
+        $this->form->setDefault('acquisitionType', 
$this->context->routing->generate(null, array($this->resource->acquisitionType, 
'module' => 'term')));
+        $this->form->setValidator('acquisitionType', new sfValidatorString);
+
+        $choices = array();
+        $choices[null] = null;
+        foreach 
(QubitTaxonomy::getTermsById(QubitTaxonomy::ACCESSION_ACQUISITION_TYPE_ID) as 
$item)
+        {
+          $choices[$this->context->routing->generate(null, array($item, 
'module' => 'term'))] = $item;
+        }
+
+        $this->form->setWidget('acquisitionType', new 
sfWidgetFormSelect(array('choices' => $choices)));
+
+        break;
+
+      case 'processingPriority':
+        $this->form->setDefault('processingPriority', 
$this->context->routing->generate(null, 
array($this->resource->processingPriority, 'module' => 'term')));
+        $this->form->setValidator('processingPriority', new sfValidatorString);
+
+        $choices = array();
+        $choices[null] = null;
+        foreach 
(QubitTaxonomy::getTermsById(QubitTaxonomy::ACCESSION_PROCESSING_PRIORITY_ID) 
as $item)
+        {
+          $choices[$this->context->routing->generate(null, array($item, 
'module' => 'term'))] = $item;
+        }
+
+        $this->form->setWidget('processingPriority', new 
sfWidgetFormSelect(array('choices' => $choices)));
+
+        break;
+
+      case 'processingStatus':
+        $this->form->setDefault('processingStatus', 
$this->context->routing->generate(null, 
array($this->resource->processingStatus, 'module' => 'term')));
+        $this->form->setValidator('processingStatus', new sfValidatorString);
+
+        $choices = array();
+        $choices[null] = null;
+        foreach 
(QubitTaxonomy::getTermsById(QubitTaxonomy::ACCESSION_PROCESSING_STATUS_ID) as 
$item)
+        {
+          $choices[$this->context->routing->generate(null, array($item, 
'module' => 'term'))] = $item;
+        }
+
+        $this->form->setWidget('processingStatus', new 
sfWidgetFormSelect(array('choices' => $choices)));
+
+        break;
+
+      case 'resourceType':
+        $this->form->setDefault('resourceType', 
$this->context->routing->generate(null, array($this->resource->resourceType, 
'module' => 'term')));
+        $this->form->setValidator('resourceType', new sfValidatorString);
+
+        $choices = array();
+        $choices[null] = null;
+        foreach 
(QubitTaxonomy::getTermsById(QubitTaxonomy::ACCESSION_RESOURCE_TYPE_ID) as 
$item)
+        {
+          $choices[$this->context->routing->generate(null, array($item, 
'module' => 'term'))] = $item;
+        }
+
+        $this->form->setWidget('resourceType', new 
sfWidgetFormSelect(array('choices' => $choices)));
+
+        break;
+
+      case 'creator':
       case 'identifier':
+      case 'receivedExtentUnits':
       case 'title':
         $this->form->setDefault($name, $this->resource[$name]);
         $this->form->setValidator($name, new sfValidatorString);
@@ -55,6 +129,18 @@
 
         break;
 
+      case 'archivalHistory':
+      case 'condition':
+      case 'content':
+      case 'locationInformation':
+      case 'processingNotes':
+      case 'sourceOfAcquisition':
+        $this->form->setDefault($name, $this->resource[$name]);
+        $this->form->setValidator($name, new sfValidatorString);
+        $this->form->setWidget($name, new sfWidgetFormTextarea);
+
+        break;
+
       default:
 
         return parent::addField($name);

Modified: 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editSuccess.php
==============================================================================
--- 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editSuccess.php
 Mon Jun 27 22:14:44 2011        (r9203)
+++ 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editSuccess.php
 Mon Jun 27 22:19:42 2011        (r9204)
@@ -16,6 +16,12 @@
     ->label(__('Identifier').' <span class="form-required" title="'.__('This 
is a mandatory element.').'">*</span>')
     ->renderRow() ?>
 
+  <?php echo render_field($form->sourceOfAcquisition
+    ->label(__('Source of acquisition').' <span class="form-required" 
title="'.__('This is a mandatory element.').'">*</span>'), $resource) ?>
+
+  <?php echo render_field($form->locationInformation
+    ->label(__('Location information').' <span class="form-required" 
title="'.__('This is a mandatory element.').'">*</span>'), $resource) ?>
+
   <fieldset class="collapsible collapsed" id="donorArea">
 
     <legend><?php echo __('Donor/Transferring body area') ?></legend>
@@ -26,8 +32,28 @@
 
     <legend><?php echo __('Administrative area') ?></legend>
 
+    <?php echo $form->acquisitionType->renderRow() ?>
+
+    <?php echo $form->resourceType->renderRow() ?>
+
     <?php echo render_field($form->title, $resource) ?>
 
+    <?php echo render_field($form->creator, $resource) ?>
+
+    <?php echo render_field($form->archivalHistory, $resource, array('class' 
=> 'resizable')) ?>
+
+    <?php echo render_field($form->content, $resource, array('class' => 
'resizable')) ?>
+
+    <?php echo render_field($form->condition, $resource, array('class' => 
'resizable')) ?>
+
+    <?php echo render_field($form->receivedExtentUnits, $resource) ?>
+
+    <?php echo $form->processingStatus->renderRow() ?>
+
+    <?php echo $form->processingPriority->renderRow() ?>
+
+    <?php echo render_field($form->processingNotes, $resource, array('class' 
=> 'resizable')) ?>
+
   </fieldset>
 
   <fieldset class="collapsible collapsed" id="rightsArea">

Modified: 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
==============================================================================
--- 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
        Mon Jun 27 22:14:44 2011        (r9203)
+++ 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
        Mon Jun 27 22:19:42 2011        (r9204)
@@ -1,4 +1,4 @@
-<h1><?php echo __('View accession record') ?></h1>
+<h1><?php echo __('View accession record') ?></h1>n
 
 <h1 class="label"><?php echo render_title($resource) ?></h1>
 
@@ -25,6 +25,10 @@
 
         <li><?php echo link_to(__('Edit'), array($resource, 'module' => 
'accession', 'action' => 'edit')) ?></li>
 
+        <li><?php echo link_to(__('Deaccession'), array($resource, 'module' => 
'accession', 'action' => 'editDeaccession')) ?></li>
+
+        <li><?php echo link_to(__('Create %1%', array('%1%' => 
sfConfig::get('app_ui_label_informationobject'))), array($resource, 'module' => 
'accession', 'action' => 'edit')) ?></li>
+
     </ul>
   </div>
 

-- 
You received this message because you are subscribed to the Google Groups 
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/qubit-commits?hl=en.

Reply via email to