mirror of
https://github.com/Karaka-Management/oms-Tasks.git
synced 2026-02-09 19:38:41 +00:00
Cleanup and implement raw text
This commit is contained in:
parent
ff23a66f93
commit
88a735dc6c
|
|
@ -87,6 +87,7 @@ class Installer extends InstallerAbstract
|
||||||
ADD CONSTRAINT `' . $dbPool->get()->prefix . 'task_media_ibfk_2` FOREIGN KEY (`task_media_dst`) REFERENCES `' . $dbPool->get()->prefix . 'media` (`media_id`);'
|
ADD CONSTRAINT `' . $dbPool->get()->prefix . 'task_media_ibfk_2` FOREIGN KEY (`task_media_dst`) REFERENCES `' . $dbPool->get()->prefix . 'media` (`media_id`);'
|
||||||
)->execute();
|
)->execute();
|
||||||
|
|
||||||
|
// type = to, cc, bcc
|
||||||
$dbPool->get()->con->prepare(
|
$dbPool->get()->con->prepare(
|
||||||
'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'task_account` (
|
'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'task_account` (
|
||||||
`task_account_id` int(11) NOT NULL AUTO_INCREMENT,
|
`task_account_id` int(11) NOT NULL AUTO_INCREMENT,
|
||||||
|
|
|
||||||
|
|
@ -138,6 +138,8 @@ class Task implements \JsonSerializable
|
||||||
|
|
||||||
protected $media = [];
|
protected $media = [];
|
||||||
|
|
||||||
|
protected $acc = [];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -77,6 +77,12 @@ class TaskMapper extends DataMapperAbstract
|
||||||
'dst' => 'task_media_src',
|
'dst' => 'task_media_src',
|
||||||
'src' => 'task_media_dst',
|
'src' => 'task_media_dst',
|
||||||
],
|
],
|
||||||
|
'acc' => [ // todo: maybe make this a has one and then link to collection instead of single media files!
|
||||||
|
'mapper' => AccountMapper::class,
|
||||||
|
'table' => 'task_account',
|
||||||
|
'dst' => 'task_account_account',
|
||||||
|
'src' => 'task_account_task',
|
||||||
|
],
|
||||||
];
|
];
|
||||||
|
|
||||||
protected static $belongsTo = [
|
protected static $belongsTo = [
|
||||||
|
|
|
||||||
|
|
@ -27,13 +27,10 @@ use phpOMS\Stdlib\Base\Enum;
|
||||||
*/
|
*/
|
||||||
abstract class TaskPriority extends Enum
|
abstract class TaskPriority extends Enum
|
||||||
{
|
{
|
||||||
|
/* public */ const NONE = 0;
|
||||||
/* public */ const VLOW = 1;
|
/* public */ const VLOW = 1;
|
||||||
|
|
||||||
/* public */ const LOW = 2;
|
/* public */ const LOW = 2;
|
||||||
|
|
||||||
/* public */ const MEDIUM = 3;
|
/* public */ const MEDIUM = 3;
|
||||||
|
|
||||||
/* public */ const HIGH = 4;
|
/* public */ const HIGH = 4;
|
||||||
|
|
||||||
/* public */ const VHIGH = 5;
|
/* public */ const VHIGH = 5;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -63,6 +63,7 @@ return ['Tasks' => [
|
||||||
'S4' => 'Canceled',
|
'S4' => 'Canceled',
|
||||||
'S5' => 'Done',
|
'S5' => 'Done',
|
||||||
'S6' => 'Closed',
|
'S6' => 'Closed',
|
||||||
|
'P0' => 'None',
|
||||||
'P1' => 'Very Low',
|
'P1' => 'Very Low',
|
||||||
'P2' => 'Low',
|
'P2' => 'Low',
|
||||||
'P3' => 'Medium',
|
'P3' => 'Medium',
|
||||||
|
|
|
||||||
|
|
@ -31,9 +31,10 @@ echo $this->getData('nav')->render(); ?>
|
||||||
<tr><td><?= $this->getData('accGrpSelector')->render('iCC', false); ?>
|
<tr><td><?= $this->getData('accGrpSelector')->render('iCC', false); ?>
|
||||||
<tr><td><label for="iPriority"><?= $this->getHtml('Priority') ?></label>
|
<tr><td><label for="iPriority"><?= $this->getHtml('Priority') ?></label>
|
||||||
<tr><td><select id="iPriority" name="priority">
|
<tr><td><select id="iPriority" name="priority">
|
||||||
|
<option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::NONE); ?>" selected><?= $this->getHtml('P0') ?>
|
||||||
<option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::VLOW); ?>"><?= $this->getHtml('P1') ?>
|
<option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::VLOW); ?>"><?= $this->getHtml('P1') ?>
|
||||||
<option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::LOW); ?>"><?= $this->getHtml('P2') ?>
|
<option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::LOW); ?>"><?= $this->getHtml('P2') ?>
|
||||||
<option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::MEDIUM); ?>" selected><?= $this->getHtml('P3') ?>
|
<option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::MEDIUM); ?>"><?= $this->getHtml('P3') ?>
|
||||||
<option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::HIGH); ?>"><?= $this->getHtml('P4') ?>
|
<option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::HIGH); ?>"><?= $this->getHtml('P4') ?>
|
||||||
<option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::VHIGH); ?>"><?= $this->getHtml('P5') ?>
|
<option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::VHIGH); ?>"><?= $this->getHtml('P5') ?>
|
||||||
</select>
|
</select>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user