Author: sevein
Date: Tue Jul 5 14:00:16 2011
New Revision: 9246
Log:
qtAccessionPlugin date fields
Modified:
trunk/data/sql/plugins.qtAccessionPlugin.lib.model.schema.sql
trunk/plugins/qtAccessionPlugin/config/schema.yml
trunk/plugins/qtAccessionPlugin/lib/model/map/AccessionTableMap.php
trunk/plugins/qtAccessionPlugin/lib/model/map/DeaccessionTableMap.php
trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccession.php
trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccession.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editAction.class.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editDeaccessionAction.class.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/indexAction.class.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/indexDeaccessionAction.class.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editDeaccessionSuccess.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editSuccess.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexDeaccessionSuccess.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/listSuccess.php
Modified: trunk/data/sql/plugins.qtAccessionPlugin.lib.model.schema.sql
==============================================================================
--- trunk/data/sql/plugins.qtAccessionPlugin.lib.model.schema.sql Mon Jul
4 16:18:38 2011 (r9245)
+++ trunk/data/sql/plugins.qtAccessionPlugin.lib.model.schema.sql Tue Jul
5 14:00:16 2011 (r9246)
@@ -14,6 +14,7 @@
(
`id` INTEGER NOT NULL,
`acquisition_type_id` INTEGER,
+ `date` DATE,
`identifier` VARCHAR(255),
`processing_priority_id` INTEGER,
`processing_status_id` INTEGER,
@@ -82,6 +83,7 @@
(
`id` INTEGER NOT NULL,
`accession_id` INTEGER,
+ `date` DATE,
`identifier` VARCHAR(255),
`scope_id` INTEGER,
`created_at` DATETIME NOT NULL,
Modified: trunk/plugins/qtAccessionPlugin/config/schema.yml
==============================================================================
--- trunk/plugins/qtAccessionPlugin/config/schema.yml Mon Jul 4 16:18:38
2011 (r9245)
+++ trunk/plugins/qtAccessionPlugin/config/schema.yml Tue Jul 5 14:00:16
2011 (r9246)
@@ -4,6 +4,7 @@
accession:
id: { type: integer, required: true, primaryKey: true, foreignTable:
object, foreignReference: id, onDelete: cascade, inheritanceKey: true }
acquisition_type_id: { type: integer, foreignTable: term,
foreignReference: id }
+ date: bu_date
identifier: varchar(255)
processing_priority_id: { type: integer, foreignTable: term,
foreignReference: id }
processing_status_id: { type: integer, foreignTable: term,
foreignReference: id }
@@ -25,6 +26,7 @@
deaccession:
id: { type: integer, required: true, primaryKey: true, foreignTable:
object, foreignReference: id, onDelete: cascade, inheritanceKey: true }
accession_id: { type: integer, foreignTable: accession, foreignReference:
id, onDelete: cascade }
+ date: bu_date
identifier: varchar(255)
scope_id: { type: integer, foreignTable: term, foreignReference: id }
created_at:
Modified: trunk/plugins/qtAccessionPlugin/lib/model/map/AccessionTableMap.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/map/AccessionTableMap.php Mon Jul
4 16:18:38 2011 (r9245)
+++ trunk/plugins/qtAccessionPlugin/lib/model/map/AccessionTableMap.php Tue Jul
5 14:00:16 2011 (r9246)
@@ -38,6 +38,7 @@
// columns
$this->addForeignPrimaryKey('ID', 'id', 'INTEGER' , 'object',
'ID', true, null, null);
$this->addForeignKey('ACQUISITION_TYPE_ID',
'acquisitionTypeId', 'INTEGER', 'term', 'ID', false, null, null);
+ $this->addColumn('DATE', 'date', 'DATE', false, null, null);
$this->addColumn('IDENTIFIER', 'identifier', 'VARCHAR', false,
255, null);
$this->addForeignKey('PROCESSING_PRIORITY_ID',
'processingPriorityId', 'INTEGER', 'term', 'ID', false, null, null);
$this->addForeignKey('PROCESSING_STATUS_ID',
'processingStatusId', 'INTEGER', 'term', 'ID', false, null, null);
Modified: trunk/plugins/qtAccessionPlugin/lib/model/map/DeaccessionTableMap.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/map/DeaccessionTableMap.php
Mon Jul 4 16:18:38 2011 (r9245)
+++ trunk/plugins/qtAccessionPlugin/lib/model/map/DeaccessionTableMap.php
Tue Jul 5 14:00:16 2011 (r9246)
@@ -38,6 +38,7 @@
// columns
$this->addForeignPrimaryKey('ID', 'id', 'INTEGER' , 'object',
'ID', true, null, null);
$this->addForeignKey('ACCESSION_ID', 'accessionId', 'INTEGER',
'accession', 'ID', false, null, null);
+ $this->addColumn('DATE', 'date', 'DATE', false, null, null);
$this->addColumn('IDENTIFIER', 'identifier', 'VARCHAR', false,
255, null);
$this->addForeignKey('SCOPE_ID', 'scopeId', 'INTEGER', 'term',
'ID', false, null, null);
$this->addColumn('CREATED_AT', 'createdAt', 'TIMESTAMP', true,
null, null);
Modified: trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccession.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccession.php Mon Jul
4 16:18:38 2011 (r9245)
+++ trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccession.php Tue Jul
5 14:00:16 2011 (r9246)
@@ -9,6 +9,7 @@
ID = 'accession.ID',
ACQUISITION_TYPE_ID = 'accession.ACQUISITION_TYPE_ID',
+ DATE = 'accession.DATE',
IDENTIFIER = 'accession.IDENTIFIER',
PROCESSING_PRIORITY_ID = 'accession.PROCESSING_PRIORITY_ID',
PROCESSING_STATUS_ID = 'accession.PROCESSING_STATUS_ID',
@@ -25,6 +26,7 @@
$criteria->addSelectColumn(QubitAccession::ID);
$criteria->addSelectColumn(QubitAccession::ACQUISITION_TYPE_ID);
+ $criteria->addSelectColumn(QubitAccession::DATE);
$criteria->addSelectColumn(QubitAccession::IDENTIFIER);
$criteria->addSelectColumn(QubitAccession::PROCESSING_PRIORITY_ID);
$criteria->addSelectColumn(QubitAccession::PROCESSING_STATUS_ID);
Modified: trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccession.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccession.php Mon Jul
4 16:18:38 2011 (r9245)
+++ trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccession.php Tue Jul
5 14:00:16 2011 (r9246)
@@ -9,6 +9,7 @@
ID = 'deaccession.ID',
ACCESSION_ID = 'deaccession.ACCESSION_ID',
+ DATE = 'deaccession.DATE',
IDENTIFIER = 'deaccession.IDENTIFIER',
SCOPE_ID = 'deaccession.SCOPE_ID',
CREATED_AT = 'deaccession.CREATED_AT',
@@ -23,6 +24,7 @@
$criteria->addSelectColumn(QubitDeaccession::ID);
$criteria->addSelectColumn(QubitDeaccession::ACCESSION_ID);
+ $criteria->addSelectColumn(QubitDeaccession::DATE);
$criteria->addSelectColumn(QubitDeaccession::IDENTIFIER);
$criteria->addSelectColumn(QubitDeaccession::SCOPE_ID);
$criteria->addSelectColumn(QubitDeaccession::CREATED_AT);
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editAction.class.php
Mon Jul 4 16:18:38 2011 (r9245)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editAction.class.php
Tue Jul 5 14:00:16 2011 (r9246)
@@ -27,6 +27,7 @@
'condition',
'content',
'creator',
+ 'date',
'identifier',
'locationInformation',
'resourceType',
@@ -140,6 +141,18 @@
break;
+ case 'date':
+ // If it is a *new* accession, set
+ if (!isset($this->resource->id))
+ {
+ $dt = new DateTime;
+ $this->form->setDefault('date', $dt->format('Y-m-d'));
+ $this->form->setValidator('date', new sfValidatorString);
+ $this->form->setWidget('date', new sfWidgetFormInput);
+
+ break;
+ }
+
case 'creator':
case 'identifier':
case 'receivedExtentUnits':
@@ -208,5 +221,7 @@
$this->redirect(array($this->resource, 'module' =>
'qtAccessionPlugin', 'action' => 'index'));
}
}
+
+ QubitDescription::addAssets($this->response);
}
}
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editDeaccessionAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editDeaccessionAction.class.php
Mon Jul 4 16:18:38 2011 (r9245)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editDeaccessionAction.class.php
Tue Jul 5 14:00:16 2011 (r9246)
@@ -22,6 +22,7 @@
// Arrays not allowed in class constants
public static
$NAMES = array(
+ 'date',
'description',
'extent',
'identifier',
@@ -101,6 +102,18 @@
break;
+ case 'date':
+ // If it is a *new* accession, set
+ if (!isset($this->resource->id))
+ {
+ $dt = new DateTime;
+ $this->form->setDefault('date', $dt->format('Y-m-d'));
+ $this->form->setValidator('date', new sfValidatorString);
+ $this->form->setWidget('date', new sfWidgetFormInput);
+
+ break;
+ }
+
case 'identifier':
$this->form->setDefault($name, $this->resource[$name]);
$this->form->setValidator($name, new sfValidatorString);
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/indexAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/indexAction.class.php
Mon Jul 4 16:18:38 2011 (r9245)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/indexAction.class.php
Tue Jul 5 14:00:16 2011 (r9246)
@@ -46,6 +46,11 @@
'required' => $this->context->i18n->__('Identifier - This is a
mandatory element.')));
$values['identifier'] = $this->resource->identifier;
+ $validatorSchema->date = new sfValidatorString(array(
+ 'required' => true), array(
+ 'required' => $this->context->i18n->__('Date of acquisition - This is
a mandatory element.')));
+ $values['date'] = $this->resource->date;
+
$validatorSchema->sourceOfAcquisition = new sfValidatorString(array(
'required' => true), array(
'required' => $this->context->i18n->__('Source of acquisition - This
is a mandatory element.')));
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/indexDeaccessionAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/indexDeaccessionAction.class.php
Mon Jul 4 16:18:38 2011 (r9245)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/indexDeaccessionAction.class.php
Tue Jul 5 14:00:16 2011 (r9246)
@@ -46,6 +46,11 @@
'required' => $this->context->i18n->__('Identifier - This is a
mandatory element.')));
$values['identifier'] = $this->resource->identifier;
+ $validatorSchema->date = new sfValidatorString(array(
+ 'required' => true), array(
+ 'required' => $this->context->i18n->__('Date of acquisition - This is
a mandatory element.')));
+ $values['date'] = $this->resource->date;
+
$validatorSchema->scope = new sfValidatorString(array(
'required' => true), array(
'required' => $this->context->i18n->__('Scope - This is a mandatory
element.')));
@@ -54,7 +59,7 @@
$validatorSchema->description = new sfValidatorString(array(
'required' => true), array(
'required' => $this->context->i18n->__('Description - This is a
mandatory element.')));
- $values['identifier'] = $this->resource->description;
+ $values['identifier'] =
$this->resource->getDescription(array('culltureFallback' => true));
try
{
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editDeaccessionSuccess.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editDeaccessionSuccess.php
Mon Jul 4 16:18:38 2011 (r9245)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editDeaccessionSuccess.php
Tue Jul 5 14:00:16 2011 (r9246)
@@ -20,6 +20,11 @@
->label(__('Scope').' <span class="form-required" title="'.__('This is a
mandatory element.').'">*</span>')
->renderRow() ?>
+ <?php echo $form->date
+ ->label(__('Date').' <span class="form-required" title="'.__('This is a
mandatory element.').'">*</span>')
+ ->help(__('Use YYYY-MM-DD format.'))
+ ->renderRow() ?>
+
<?php echo render_field($form->description
->label(__('Description').' <span class="form-required" title="'.__('This
is a mandatory element.').'">*</span>'), $resource, array('class' =>
'resizable')) ?>
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editSuccess.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editSuccess.php
Mon Jul 4 16:18:38 2011 (r9245)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/editSuccess.php
Tue Jul 5 14:00:16 2011 (r9246)
@@ -15,6 +15,11 @@
<?php echo $form->identifier
->label(__('Identifier').' <span class="form-required" title="'.__('This
is a mandatory element.').'">*</span>')
->renderRow() ?>
+
+ <?php echo $form->date
+ ->label(__('Acquisition date').' <span class="form-required"
title="'.__('This is a mandatory element.').'">*</span>')
+ ->help(__('Use YYYY-MM-DD format.'))
+ ->renderRow() ?>
<?php echo render_field($form->sourceOfAcquisition
->label(__('Source of acquisition').' <span class="form-required"
title="'.__('This is a mandatory element.').'">*</span>'), $resource,
array('class' => 'resizable')) ?>
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexDeaccessionSuccess.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexDeaccessionSuccess.php
Mon Jul 4 16:18:38 2011 (r9245)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexDeaccessionSuccess.php
Tue Jul 5 14:00:16 2011 (r9246)
@@ -23,6 +23,8 @@
<?php echo render_show(__('Scope'), render_value($resource->scope)) ?>
+<?php echo render_show(__('Date'), render_value($resource->date)) ?>
+
<?php echo render_show(__('Description'),
render_value($resource->description)) ?>
<?php echo render_show(__('Extent'), render_value($resource->extent)) ?>
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
Mon Jul 4 16:18:38 2011 (r9245)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
Tue Jul 5 14:00:16 2011 (r9246)
@@ -14,6 +14,8 @@
<?php echo render_show(__('Identifier'), render_value($resource->identifier))
?>
+<?php echo render_show(__('Date of acquisition'),
render_value($resource->date)) ?>
+
<?php echo render_show(__('Source of acquisition'),
render_value($resource->getSourceOfAcquisition(array('cultureFallback' =>
true)))) ?>
<?php echo render_show(__('Location information'),
render_value($resource->getLocationInformation(array('cultureFallback' =>
true)))) ?>
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/listSuccess.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/listSuccess.php
Mon Jul 4 16:18:38 2011 (r9245)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/listSuccess.php
Tue Jul 5 14:00:16 2011 (r9246)
@@ -15,7 +15,7 @@
<td>
<?php echo link_to(render_title($item), array($item, 'module' =>
'accession')) ?>
</td><td>
-
+ <?php echo $item->date ?>
</td>
</tr>
<?php endforeach; ?>
--
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.
