mirror of
https://github.com/Karaka-Management/oms-Draw.git
synced 2026-01-11 14:28:40 +00:00
[Draw] working mini draft
This commit is contained in:
parent
6bdc90c65e
commit
baf4c5dd17
|
|
@ -43,6 +43,35 @@ class Installer extends InstallerAbstract
|
|||
|
||||
switch ($dbPool->get('core')->getType()) {
|
||||
case DatabaseType::MYSQL:
|
||||
$dbPool->get('core')->con->prepare(
|
||||
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'draw_image` (
|
||||
`draw_image_id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`draw_image_media` int(11) NOT NULL,
|
||||
`draw_image_path` varchar(255) NOT NULL,
|
||||
PRIMARY KEY (`draw_image_id`),
|
||||
KEY `draw_image_media` (`draw_image_media`)
|
||||
)ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
|
||||
)->execute();
|
||||
|
||||
$dbPool->get('core')->con->prepare(
|
||||
'ALTER TABLE `' . $dbPool->get('core')->prefix . 'draw_image`
|
||||
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'draw_image_ibfk_1` FOREIGN KEY (`draw_image_media`) REFERENCES `' . $dbPool->get('core')->prefix . 'media` (`media_id`);'
|
||||
)->execute();
|
||||
|
||||
$dbPool->get('core')->con->prepare(
|
||||
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'editor_tag` (
|
||||
`editor_tag_id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`editor_tag_doc` int(11) NOT NULL,
|
||||
`editor_tag_tag` varchar(20) NOT NULL,
|
||||
PRIMARY KEY (`editor_tag_id`),
|
||||
KEY `editor_tag_doc` (`editor_tag_doc`)
|
||||
)ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
|
||||
)->execute();
|
||||
|
||||
$dbPool->get('core')->con->prepare(
|
||||
'ALTER TABLE `' . $dbPool->get('core')->prefix . 'editor_tag`
|
||||
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'editor_tag_ibfk_1` FOREIGN KEY (`editor_tag_doc`) REFERENCES `' . $dbPool->get('core')->prefix . 'draw_image` (`draw_image_id`);'
|
||||
)->execute();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
use phpOMS\Router\RouteVerb;
|
||||
|
||||
return [
|
||||
'^.*/backend/draw.*$' => [
|
||||
'^.*/api/draw.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Draw\Controller:apiDrawCreate',
|
||||
'verb' => RouteVerb::SET,
|
||||
|
|
|
|||
|
|
@ -19,4 +19,10 @@ return [
|
|||
'verb' => RouteVerb::GET,
|
||||
],
|
||||
],
|
||||
'^.*/backend/draw/single.*$' => [
|
||||
[
|
||||
'dest' => '\Modules\Draw\Controller:viewDrawSingle',
|
||||
'verb' => RouteVerb::GET,
|
||||
],
|
||||
],
|
||||
];
|
||||
|
|
|
|||
|
|
@ -15,12 +15,19 @@
|
|||
*/
|
||||
namespace Modules\Draw;
|
||||
|
||||
use Model\Message\FormValidation;
|
||||
use Modules\Draw\Models\DrawImage;
|
||||
use Modules\Draw\Models\DrawImageMapper;
|
||||
use Modules\Media\Models\UploadStatus;
|
||||
use phpOMS\Asset\AssetType;
|
||||
use phpOMS\Message\RequestAbstract;
|
||||
use phpOMS\Message\ResponseAbstract;
|
||||
use phpOMS\Model\Html\Head;
|
||||
use phpOMS\Module\ModuleAbstract;
|
||||
use phpOMS\Module\WebInterface;
|
||||
use Modules\Media\Controller as MediaController;
|
||||
use phpOMS\System\File\Local\File;
|
||||
use phpOMS\Utils\ImageUtils;
|
||||
use phpOMS\Views\View;
|
||||
|
||||
/**
|
||||
|
|
@ -132,6 +139,9 @@ class Controller extends ModuleAbstract implements WebInterface
|
|||
$view->setTemplate('/Modules/Draw/Theme/Backend/draw-list');
|
||||
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005201001, $request, $response));
|
||||
|
||||
$images = DrawImageMapper::getNewest(25);
|
||||
$view->addData('images', $images);
|
||||
|
||||
return $view;
|
||||
}
|
||||
|
||||
|
|
@ -140,11 +150,7 @@ class Controller extends ModuleAbstract implements WebInterface
|
|||
$val = [];
|
||||
if (
|
||||
($val['title'] = empty($request->getData('title')))
|
||||
|| ($val['image'] = empty($request->getData('plain')))
|
||||
|| ($val['status'] = (
|
||||
$request->getData('status') === null
|
||||
|| !NewsStatus::isValidValue((int) $request->getData('status'))
|
||||
))
|
||||
|| ($val['image'] = empty($request->getData('image')))
|
||||
) {
|
||||
return $val;
|
||||
}
|
||||
|
|
@ -181,21 +187,23 @@ class Controller extends ModuleAbstract implements WebInterface
|
|||
$rnd = mt_rand();
|
||||
} while (file_exists($path . '/' . $filename));
|
||||
|
||||
$fullPath = $path . '/' . $filename;
|
||||
$fullPath = __DIR__ . '/../../' . $path . '/' . $filename;
|
||||
|
||||
$this->createLocalFile($fullPath, $request->getData('image'));
|
||||
|
||||
$status = [
|
||||
'path' => $path,
|
||||
'filename' => $filename,
|
||||
'name' => $request->getData('title'),
|
||||
'size' => File::size($fullPath),
|
||||
'extension' => $extension,
|
||||
'status' => UploadStatus::OK,
|
||||
];
|
||||
|
||||
$media = MediaController::createDbEntries($status, $request->getAccount());
|
||||
$draw = Draw::fromMedia(end($media));
|
||||
|
||||
DrawMapper::create($draw);
|
||||
$media = MediaController::createDbEntry($status, $request->getAccount());
|
||||
$draw = DrawImage::fromMedia($media);
|
||||
|
||||
DrawImageMapper::create($draw);
|
||||
|
||||
$response->set('image', $draw->jsonSerialize());
|
||||
}
|
||||
|
|
|
|||
154
Models/DrawImage.php
Normal file
154
Models/DrawImage.php
Normal file
|
|
@ -0,0 +1,154 @@
|
|||
<?php
|
||||
/**
|
||||
* Orange Management
|
||||
*
|
||||
* PHP Version 7.0
|
||||
*
|
||||
* @category TBD
|
||||
* @package TBD
|
||||
* @author OMS Development Team <dev@oms.com>
|
||||
* @author Dennis Eichhorn <d.eichhorn@oms.com>
|
||||
* @copyright 2013 Dennis Eichhorn
|
||||
* @license OMS License 1.0
|
||||
* @version 1.0.0
|
||||
* @link http://orange-management.com
|
||||
*/
|
||||
namespace Modules\Draw\Models;
|
||||
|
||||
use Modules\Media\Models\Media;
|
||||
use phpOMS\Contract\ArrayableInterface;
|
||||
|
||||
/**
|
||||
* News article class.
|
||||
*
|
||||
* @category Module
|
||||
* @package Framework
|
||||
* @author OMS Development Team <dev@oms.com>
|
||||
* @author Dennis Eichhorn <d.eichhorn@oms.com>
|
||||
* @license OMS License 1.0
|
||||
* @link http://orange-management.com
|
||||
* @since 1.0.0
|
||||
*/
|
||||
class DrawImage implements ArrayableInterface, \JsonSerializable
|
||||
{
|
||||
|
||||
/**
|
||||
* Article ID.
|
||||
*
|
||||
* @var int
|
||||
* @since 1.0.0
|
||||
*/
|
||||
private $id = 0;
|
||||
|
||||
/**
|
||||
* Doc path for organizing.
|
||||
*
|
||||
* @var string
|
||||
* @since 1.0.0
|
||||
*/
|
||||
private $path = '';
|
||||
|
||||
/**
|
||||
* Media object.
|
||||
*
|
||||
* @var Media
|
||||
* @since 1.0.0
|
||||
*/
|
||||
private $media = null;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @since 1.0.0
|
||||
* @author Dennis Eichhorn <d.eichhorn@oms.com>
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* @return int
|
||||
*
|
||||
* @since 1.0.0
|
||||
* @author Dennis Eichhorn <d.eichhorn@oms.com>
|
||||
*/
|
||||
public function getId() : int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*
|
||||
* @since 1.0.0
|
||||
* @author Dennis Eichhorn <d.eichhorn@oms.com>
|
||||
*/
|
||||
public function getPath() : string
|
||||
{
|
||||
return $this->path;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $path
|
||||
*
|
||||
* @return mixed
|
||||
*
|
||||
* @since 1.0.0
|
||||
* @author Dennis Eichhorn <d.eichhorn@oms.com>
|
||||
*/
|
||||
public function setPath(string $path)
|
||||
{
|
||||
$this->path = $path;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*
|
||||
* @since 1.0.0
|
||||
* @author Dennis Eichhorn <d.eichhorn@oms.com>
|
||||
*/
|
||||
public function getMedia()
|
||||
{
|
||||
return $this->media;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $media
|
||||
*
|
||||
* @return mixed
|
||||
*
|
||||
* @since 1.0.0
|
||||
* @author Dennis Eichhorn <d.eichhorn@oms.com>
|
||||
*/
|
||||
public function setMedia($media)
|
||||
{
|
||||
$this->media = $media;
|
||||
}
|
||||
|
||||
public function toArray() : array
|
||||
{
|
||||
return [
|
||||
'id' => $this->id,
|
||||
'path' => $this->path,
|
||||
'media' => $this->media->toArray(),
|
||||
];
|
||||
}
|
||||
|
||||
public function __toString()
|
||||
{
|
||||
return $this->jsonSerialize();
|
||||
}
|
||||
|
||||
public function jsonSerialize()
|
||||
{
|
||||
return json_encode($this->toArray());
|
||||
}
|
||||
|
||||
public static function fromMedia(Media $media)
|
||||
{
|
||||
$image = new self();
|
||||
$image->setMedia($media);
|
||||
|
||||
return $image;
|
||||
}
|
||||
}
|
||||
126
Models/DrawImageMapper.php
Normal file
126
Models/DrawImageMapper.php
Normal file
|
|
@ -0,0 +1,126 @@
|
|||
<?php
|
||||
/**
|
||||
* Orange Management
|
||||
*
|
||||
* PHP Version 7.0
|
||||
*
|
||||
* @category TBD
|
||||
* @package TBD
|
||||
* @author OMS Development Team <dev@oms.com>
|
||||
* @author Dennis Eichhorn <d.eichhorn@oms.com>
|
||||
* @copyright 2013 Dennis Eichhorn
|
||||
* @license OMS License 1.0
|
||||
* @version 1.0.0
|
||||
* @link http://orange-management.com
|
||||
*/
|
||||
namespace Modules\Draw\Models;
|
||||
|
||||
use Modules\Admin\Models\AccountMapper;
|
||||
use phpOMS\DataStorage\Database\DataMapperAbstract;
|
||||
use phpOMS\DataStorage\Database\Query\Builder;
|
||||
use phpOMS\DataStorage\Database\Query\Column;
|
||||
use phpOMS\DataStorage\Database\RelationType;
|
||||
|
||||
class DrawImageMapper extends DataMapperAbstract
|
||||
{
|
||||
|
||||
/**
|
||||
* Columns.
|
||||
*
|
||||
* @var array
|
||||
* @since 1.0.0
|
||||
*/
|
||||
static protected $columns = [
|
||||
'draw_image_id' => ['name' => 'draw_image_id', 'type' => 'int', 'internal' => 'id'],
|
||||
'draw_image_media' => ['name' => 'draw_image_media', 'type' => 'int', 'internal' => 'media'],
|
||||
'draw_image_path' => ['name' => 'draw_image_path', 'type' => 'string', 'internal' => 'path'],
|
||||
];
|
||||
|
||||
/**
|
||||
* Has one relation.
|
||||
*
|
||||
* @var array
|
||||
* @since 1.0.0
|
||||
*/
|
||||
protected static $ownsOne = [
|
||||
'media' => [
|
||||
'mapper' => \Modules\Media\Models\MediaMapper::class,
|
||||
'src' => 'draw_image_media',
|
||||
],
|
||||
];
|
||||
|
||||
/**
|
||||
* Primary table.
|
||||
*
|
||||
* @var string
|
||||
* @since 1.0.0
|
||||
*/
|
||||
protected static $table = 'draw_image';
|
||||
|
||||
/**
|
||||
* Primary field name.
|
||||
*
|
||||
* @var string
|
||||
* @since 1.0.0
|
||||
*/
|
||||
protected static $primaryField = 'draw_image_id';
|
||||
|
||||
/**
|
||||
* Create object.
|
||||
*
|
||||
* @param mixed $obj Object
|
||||
* @param int $relations Behavior for relations creation
|
||||
*
|
||||
* @return mixed
|
||||
*
|
||||
* @since 1.0.0
|
||||
* @author Dennis Eichhorn <d.eichhorn@oms.com>
|
||||
*/
|
||||
public static function create($obj, int $relations = RelationType::ALL)
|
||||
{
|
||||
try {
|
||||
$objId = parent::create($obj, $relations);
|
||||
$query = new Builder(self::$db);
|
||||
$query->prefix(self::$db->getPrefix())
|
||||
->insert(
|
||||
'account_permission_account',
|
||||
'account_permission_from',
|
||||
'account_permission_for',
|
||||
'account_permission_id1',
|
||||
'account_permission_id2',
|
||||
'account_permission_r',
|
||||
'account_permission_w',
|
||||
'account_permission_m',
|
||||
'account_permission_d',
|
||||
'account_permission_p'
|
||||
)
|
||||
->into('account_permission')
|
||||
->values($obj->getMedia()->getCreatedBy(), 'draw', 'draw', 1, $objId, 1, 1, 1, 1, 1);
|
||||
|
||||
self::$db->con->prepare($query->toSql())->execute();
|
||||
} catch (\Exception $e) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $objId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Find.
|
||||
*
|
||||
* @param array $columns Columns to select
|
||||
*
|
||||
* @return Builder
|
||||
*
|
||||
* @since 1.0.0
|
||||
* @author Dennis Eichhorn <d.eichhorn@oms.com>
|
||||
*/
|
||||
public static function find(...$columns) : Builder
|
||||
{
|
||||
return parent::find(...$columns)->from('account_permission')
|
||||
->where('account_permission.account_permission_for', '=', 'editor')
|
||||
->where('account_permission.account_permission_id1', '=', 1)
|
||||
->where('news.news_id', '=', new Column('account_permission.account_permission_id2'))
|
||||
->where('account_permission.account_permission_r', '=', 1);
|
||||
}
|
||||
}
|
||||
|
|
@ -18,6 +18,6 @@
|
|||
DRAW: 0,
|
||||
LINE: 1,
|
||||
RECTANGLE: 2,
|
||||
CIRCLE: 3,
|
||||
CIRCLE: 3
|
||||
});
|
||||
}(window.jsOMS = window.jsOMS || {}));
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ echo $this->getData('nav')->render(); ?>
|
|||
<section class="box w-100">
|
||||
<div class="inner">
|
||||
<form id="drawForm" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/draw?csrf={$CSRF}'); ?>" method="POST">
|
||||
<input type="text" class="wf-100"><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
|
||||
<input type="text" id="iTitle" name="title" class="wf-100"><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ $footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig');
|
|||
$footerView->setPages(20);
|
||||
$footerView->setPage(1);
|
||||
|
||||
$images = $this->getData('images');
|
||||
|
||||
echo $this->getData('nav')->render(); ?>
|
||||
<div class="box">
|
||||
<table class="table">
|
||||
|
|
@ -35,7 +37,12 @@ echo $this->getData('nav')->render(); ?>
|
|||
<tr>
|
||||
<td colspan="3"><?= $footerView->render(); ?>
|
||||
<tbody>
|
||||
<?php $count = 0; foreach([] as $key => $value) : $count++; ?>
|
||||
<?php $count = 0; foreach($images as $key => $value) : $count++;
|
||||
$url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/draw/single?id=' . $value->getId()); ?>
|
||||
<tr>
|
||||
<td><?= $value->getMedia()->getName(); ?>
|
||||
<td><?= $value->getMedia()->getCreatedBy(); ?>
|
||||
<td><?= $value->getMedia()->getCreatedAt()->format('Y-m-d'); ?>
|
||||
<?php endforeach; ?>
|
||||
<?php if($count === 0) : ?>
|
||||
<tr><td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user