Skip to content
Snippets Groups Projects
Commit f992c56c authored by Tim Steiner's avatar Tim Steiner
Browse files

Made updates as requested by Patrick.

parent 6e3a33a5
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,7 @@ class LongTermStorageController extends Emw_Controller_Action ...@@ -20,7 +20,7 @@ class LongTermStorageController extends Emw_Controller_Action
$this->view->statusOptions = array( $this->view->statusOptions = array(
Application_Model_DbTable_MigrateJobs::STATUS_MIGRATED => 'Unassigned', Application_Model_DbTable_MigrateJobs::STATUS_MIGRATED => 'Unassigned',
Application_Model_DbTable_MigrateJobs::STATUS_N10_WIP => 'Active', Application_Model_DbTable_MigrateJobs::STATUS_N10_WIP => 'Active',
Application_Model_DbTable_MigrateJobs::STATUS_COMPLETE => 'Step Finished', Application_Model_DbTable_MigrateJobs::STATUS_STORED => 'Step Finished',
); );
} }
......
...@@ -11,16 +11,16 @@ class UserContactController extends Emw_Controller_Action ...@@ -11,16 +11,16 @@ class UserContactController extends Emw_Controller_Action
->join(array('m' => 'migratejobs'), 'o.nuid = m.nuid') ->join(array('m' => 'migratejobs'), 'o.nuid = m.nuid')
->joinLeft(array('n' => 'notes_migration'), 'o.nuid = n.nuid') ->joinLeft(array('n' => 'notes_migration'), 'o.nuid = n.nuid')
->where('m.migrate_status IN(?)', array( ->where('m.migrate_status IN(?)', array(
Application_Model_DbTable_MigrateJobs::STATUS_COMPLETE, Application_Model_DbTable_MigrateJobs::STATUS_STORED,
Application_Model_DbTable_MigrateJobs::STATUS_NOTIFIED, Application_Model_DbTable_MigrateJobs::STATUS_NOTIFIED,
)) ))
->order('m.stored_time'); ->order('m.stored_time');
$this->view->records = $db->query($select)->fetchAll(); $this->view->records = $db->query($select)->fetchAll();
$this->view->statusOptions = array( $this->view->statusOptions = array(
Application_Model_DbTable_MigrateJobs::STATUS_COMPLETE => 'Unassigned', Application_Model_DbTable_MigrateJobs::STATUS_STORED => 'Unassigned',
Application_Model_DbTable_MigrateJobs::STATUS_NOTIFIED => 'Active', Application_Model_DbTable_MigrateJobs::STATUS_NOTIFIED => 'Active',
//Application_Model_DbTable_MigrateJobs::STATUS_NOTIFIED => 'Step Finished', Application_Model_DbTable_MigrateJobs::STATUS_COMPLETE => 'Step Finished',
); );
} }
......
...@@ -10,8 +10,9 @@ class Application_Model_DbTable_MigrateJobs extends Unl_Db_Table_Abstract ...@@ -10,8 +10,9 @@ class Application_Model_DbTable_MigrateJobs extends Unl_Db_Table_Abstract
const STATUS_QST_WIP = '60_QST_WIP'; const STATUS_QST_WIP = '60_QST_WIP';
const STATUS_MIGRATED = '70_MIGRATED'; const STATUS_MIGRATED = '70_MIGRATED';
const STATUS_N10_WIP = '80_N10_WIP'; const STATUS_N10_WIP = '80_N10_WIP';
const STATUS_COMPLETE = '90_COMPLETE'; const STATUS_STORED = '90_STORED';
const STATUS_NOTIFIED = '95_NOTIFIED'; const STATUS_NOTIFIED = '95_NOTIFIED';
const STATUS_COMPLETE = '99_COMPLETE';
protected $_name = 'migratejobs'; protected $_name = 'migratejobs';
protected $_primary = 'nuid'; protected $_primary = 'nuid';
......
<div> <div>
<div class="grid4"> <div class="grid5">
<dl> <dl>
<dt>Request Time</dt> <dt>Proxy Address</dt>
<dd><?php echo $this->escape($this->request_time); ?></dd> <dd><?php echo $this->escape($this->proxyaddr); ?></dd>
<dt>Last Change</dt>
<dd><?php echo $this->escape($this->lastchange); ?></dd>
<dt>Status</dt>
<dd><?php echo $this->escape($this->status); ?></dd>
<dt>Details</dt>
<dd><?php echo $this->escape($this->details); ?></dd>
<dt>Migration</dt> <dt>Migration</dt>
<dd><?php echo $this->escape($this->migration); ?></dd> <dd><?php echo $this->escape($this->migration); ?></dd>
<dt>NUID</dt> <dt>Notes DN</dt>
<dd><?php echo $this->escape($this->nuid); ?></dd> <dd><?php echo $this->escape($this->notes_dn); ?></dd>
<dt>Notes Host</dt>
<dd><?php echo $this->escape($this->notes_host); ?></dd>
<dt>Notes Mailfile</dt>
<dd><?php echo $this->escape($this->notes_mailfile); ?></dd>
<dt>Vmail Choice</dt> <dt>Archive Mailfile</dt>
<dd><?php echo $this->escape($this->vmail_choice); ?></dd> <dd><?php echo $this->escape($this->archive_mailfile); ?></dd>
</dl> </dl>
</div> </div>
<div class="grid4"> <div class="grid6">
<dl> <dl class="one-line">
<dt>Migrate Status</dt> <dt>Request Time</dt>
<dd><?php echo $this->escape($this->migrate_status); ?></dd> <dd><?php echo $this->escape($this->request_time); ?></dd>
<dt>Last Change</dt>
<dd><?php echo $this->escape($this->lastchange); ?></dd>
<dt>Unarchive Time</dt> <dt>Unarchive Time</dt>
<dd><?php echo $this->escape($this->unarchive_time); ?></dd> <dd><?php echo $this->escape($this->unarchive_time); ?></dd>
...@@ -40,35 +40,15 @@ ...@@ -40,35 +40,15 @@
<dt>Stored Time</dt> <dt>Stored Time</dt>
<dd><?php echo $this->escape($this->stored_time); ?></dd> <dd><?php echo $this->escape($this->stored_time); ?></dd>
<dt>Mail File Size</dt>
<dd><?php echo $this->escape($this->mailfilesize); ?></dd>
</dl>
</div>
<div class="grid3">
<dl>
<dt>Notes DN</dt>
<dd><?php echo $this->escape($this->notes_dn); ?></dd>
<dt>Notes Host</dt>
<dd><?php echo $this->escape($this->notes_host); ?></dd>
<dt>Notes Mailfile</dt>
<dd><?php echo $this->escape($this->notes_mailfile); ?></dd>
<dt>Archive Mailfile</dt>
<dd><?php echo $this->escape($this->archive_mailfile); ?></dd>
<dt>Next Step</dt>
<dd><?php echo $this->escape($this->next_step); ?></dd>
</dl> </dl>
</div> </div>
</div>
<div class="clear"> <div class="clear">
<div class="grid11"> <div class="grid11">
<dl> <dl>
<dt>Mail File Size</dt>
<dd><?php echo $this->formTextarea('read[' . $this->nuid . '][mailfilesize]', $this->mailfilesize, array('disabled' => 'disabled')); ?></dd>
<dt>Notes</dt> <dt>Notes</dt>
<?php if (Application_Model_DbTable_MigrateRoles::currentUserCanEdit()) { ?> <?php if (Application_Model_DbTable_MigrateRoles::currentUserCanEdit()) { ?>
<dd><?php echo $this->formTextarea('edit[' . $this->nuid . '][notes]', $this->notes); ?> <dd><?php echo $this->formTextarea('edit[' . $this->nuid . '][notes]', $this->notes); ?>
......
...@@ -4,3 +4,14 @@ textarea { ...@@ -4,3 +4,14 @@ textarea {
height: 4em; height: 4em;
width: 95%; width: 95%;
} }
dl.one-line dt {
float: left;
clear: both;
width: 40%;
white-space: nowrap;
}
dl.one-line dt:after {
content: ': ';
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment