diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..8962881 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/yii2-workflow-manager.iml b/.idea/yii2-workflow-manager.iml new file mode 100644 index 0000000..a915166 --- /dev/null +++ b/.idea/yii2-workflow-manager.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f860151..eefce64 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ Contributions are **welcome** and will be fully **credited**. -We accept contributions via Pull Requests on [Github](https://github.com/cornernote/yii2-returnurl). +We accept contributions via Pull Requests on [Github](https://github.com/victorsemenow/yii2-returnurl). ## Pull Requests diff --git a/README.md b/README.md index 390af8b..c09cccc 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Yii2 Workflow Manager -[![Latest Version](https://img.shields.io/github/tag/cornernote/yii2-workflow-manager.svg?style=flat-square&label=release)](https://github.com/cornernote/yii2-workflow-manager/tags) +[![Latest Version](https://img.shields.io/github/tag/victorsemenow/yii2-workflow-manager.svg?style=flat-square&label=release)](https://github.com/victorsemenow/yii2-workflow-manager/tags) [![Software License](https://img.shields.io/badge/license-BSD-brightgreen.svg?style=flat-square)](LICENSE.md) -[![Build Status](https://img.shields.io/travis/cornernote/yii2-workflow-manager/master.svg?style=flat-square)](https://travis-ci.org/cornernote/yii2-workflow-manager) -[![Coverage Status](https://img.shields.io/scrutinizer/coverage/g/cornernote/yii2-workflow-manager.svg?style=flat-square)](https://scrutinizer-ci.com/g/cornernote/yii2-workflow-manager/code-structure) -[![Quality Score](https://img.shields.io/scrutinizer/g/cornernote/yii2-workflow-manager.svg?style=flat-square)](https://scrutinizer-ci.com/g/cornernote/yii2-workflow-manager) -[![Total Downloads](https://img.shields.io/packagist/dt/cornernote/yii2-workflow-manager.svg?style=flat-square)](https://packagist.org/packages/cornernote/yii2-workflow-manager) +[![Build Status](https://img.shields.io/travis/victorsemenow/yii2-workflow-manager/master.svg?style=flat-square)](https://travis-ci.org/victorsemenow/yii2-workflow-manager) +[![Coverage Status](https://img.shields.io/scrutinizer/coverage/g/victorsemenow/yii2-workflow-manager.svg?style=flat-square)](https://scrutinizer-ci.com/g/victorsemenow/yii2-workflow-manager/code-structure) +[![Quality Score](https://img.shields.io/scrutinizer/g/victorsemenow/yii2-workflow-manager.svg?style=flat-square)](https://scrutinizer-ci.com/g/victorsemenow/yii2-workflow-manager) +[![Total Downloads](https://img.shields.io/packagist/dt/victorsemenow/yii2-workflow-manager.svg?style=flat-square)](https://packagist.org/packages/victorsemenow/yii2-workflow-manager) Workflow Manager for Yii2. Extends [Yii2-Workflow](https://github.com/raoul2000/yii2-workflow/) to provide an interface to manage workflows. @@ -26,13 +26,13 @@ The preferred way to install this extension is through [composer](http://getcomp Either run ``` -$ composer require cornernote/yii2-workflow-manager "*" +$ composer require victorsemenow/yii2-workflow-manager "*" ``` or add ``` -"cornernote/yii2-workflow-manager": "*" +"victorsemenow/yii2-workflow-manager": "*" ``` to the `require` section of your `composer.json` file. @@ -41,7 +41,7 @@ to the `require` section of your `composer.json` file. ## Migrations ``` -$ php yii migrate --migrationPath=@cornernote/workflow/manager/migrations +$ php yii migrate --migrationPath=@victorsemenow/workflow/manager/migrations ``` @@ -51,12 +51,12 @@ $ php yii migrate --migrationPath=@cornernote/workflow/manager/migrations $config = [ 'components' => [ 'workflowSource' => [ - 'class' => 'cornernote\workflow\manager\components\WorkflowDbSource', + 'class' => 'victorsemenow\workflow\manager\components\WorkflowDbSource', ], ], 'modules' => [ 'workflow' => [ - 'class' => 'cornernote\workflow\manager\Module', + 'class' => 'victorsemenow\workflow\manager\Module', ], ], ]; @@ -89,16 +89,16 @@ class Post extends \yii\db\ActiveRecord ## License - Author: Brett O'Donnell -- Source Code: https://github.com/cornernote/yii2-workflow-manager +- Source Code: https://github.com/victorsemenow/yii2-workflow-manager - Copyright © 2016 Mr PHP -- License: BSD-3-Clause https://raw.github.com/cornernote/yii2-workflow-manager/master/LICENSE +- License: BSD-3-Clause https://raw.github.com/victorsemenow/yii2-workflow-manager/master/LICENSE ## Links - [Yii2 Extension](http://www.yiiframework.com/extension/yii2-workflow-manager) -- [Composer Package](https://packagist.org/packages/cornernote/yii2-workflow-manager) +- [Composer Package](https://packagist.org/packages/victorsemenow/yii2-workflow-manager) - [MrPHP](http://mrphp.com.au) -[![Mr PHP](https://raw.github.com/cornernote/mrphp-assets/master/img/code-banner.png)](http://mrphp.com.au) +[![Mr PHP](https://raw.github.com/victorsemenow/mrphp-assets/master/img/code-banner.png)](http://mrphp.com.au) diff --git a/composer.json b/composer.json index 482ef08..4788efa 100644 --- a/composer.json +++ b/composer.json @@ -1,27 +1,27 @@ { - "name": "cornernote/yii2-workflow-manager", + "name": "victorsemenov/yii2-workflow-manager", "description": "Workflow Manager for Yii2.", "keywords": ["yii2", "workflow"], "type": "yii2-extension", "license": "BSD-3-Clause", "authors": [ { - "name": "Brett O'Donnell", - "email": "cornernote@gmail.com", - "homepage": "http://mrphp.com.au/" + "name": "Victor V. Semenov ", + "email": "victorvsemenow@gmail.com" } ], "require": { "yiisoft/yii2": "*", "yiisoft/yii2-jui": "~2.0.0", "raoul2000/yii2-workflow": "@dev", - "raoul2000/yii2-workflow-view": "@dev" + "raoul2000/yii2-workflow-view": "@dev", + "kartik-v/yii2-icons": "@dev" }, "require-dev": { "phpunit/phpunit": "4.*", "scrutinizer/ocular": "~1.1" }, "autoload": { - "psr-4": {"cornernote\\workflow\\manager\\": "src"} + "psr-4": {"victorsemenov\\workflow\\manager\\": "src"} } } diff --git a/src/Module.php b/src/Module.php index d094d0f..590c088 100644 --- a/src/Module.php +++ b/src/Module.php @@ -1,19 +1,19 @@ i18n->translations['workflow'] = [ 'class' => 'yii\i18n\PhpMessageSource', 'sourceLanguage' => 'en-US', - 'basePath' => '@cornernote/workflow/manager/messages' + 'basePath' => '@victorsemenow/workflow/manager/messages' ]; } } diff --git a/src/components/WorkflowDbSource.php b/src/components/WorkflowDbSource.php index d7287d6..ee7e1ce 100644 --- a/src/components/WorkflowDbSource.php +++ b/src/components/WorkflowDbSource.php @@ -1,5 +1,5 @@ _s[$wId] = []; } if (!array_key_exists($canonicalStId, $this->_s[$wId])) { - $statusModel = \cornernote\workflow\manager\models\Status::findOne([ + $statusModel = \victorsemenow\workflow\manager\models\Status::findOne([ 'workflow_id' => $wId, 'id' => $stId ]); @@ -190,8 +190,8 @@ public function getAllStatuses($workflowId) { if (empty($this->_allStatusLoaded[$workflowId])) { $this->_s[$workflowId] = []; - /** @var \cornernote\workflow\manager\models\Status[] $statusModels */ - $statusModels = \cornernote\workflow\manager\models\Status::find() + /** @var \victorsemenow\workflow\manager\models\Status[] $statusModels */ + $statusModels = \victorsemenow\workflow\manager\models\Status::find() ->where(['workflow_id' => $workflowId]) //->andWhere(['NOT IN', 'id', array_keys($this->_s[$workflowId])]) // removed to fix sort order ->orderBy(['sort_order' => SORT_ASC]) @@ -227,7 +227,7 @@ public function getTransitions($statusId, $model = null) } if (!array_key_exists($statusId, $this->_t[$wId])) { $transitions = []; - $transitionModels = \cornernote\workflow\manager\models\Transition::find() + $transitionModels = \victorsemenow\workflow\manager\models\Transition::find() ->andWhere([ '{{%sw_transition}}.workflow_id' => $wId, '{{%sw_transition}}.start_status_id' => $stId, @@ -334,13 +334,13 @@ public function getWorkflowDefinition($id) * Loads the definition oa a workflow. * * @param string $id - * @return \cornernote\workflow\manager\models\Workflow + * @return \victorsemenow\workflow\manager\models\Workflow * @throws WorkflowException * @internal param IWorkflowSource $source */ public function loadDefinition($id) { - $workflowModel = \cornernote\workflow\manager\models\Workflow::findOne(['id' => $id]); + $workflowModel = \victorsemenow\workflow\manager\models\Workflow::findOne(['id' => $id]); if (!$workflowModel) { return null; //throw new WorkflowException('No workflow found with id ' . $id); diff --git a/src/controllers/DefaultController.php b/src/controllers/DefaultController.php index 221a736..83aec64 100644 --- a/src/controllers/DefaultController.php +++ b/src/controllers/DefaultController.php @@ -1,17 +1,17 @@ 'Рабочий процесс', +]; diff --git a/src/migrations/m201204_224340_add_title_sw_workflow.php b/src/migrations/m201204_224340_add_title_sw_workflow.php new file mode 100644 index 0000000..d82bcb4 --- /dev/null +++ b/src/migrations/m201204_224340_add_title_sw_workflow.php @@ -0,0 +1,50 @@ +addColumn('{{%sw_workflow}}' + , 'title' + , $this->varchar(32)->defaultValue(null)); + + } + + /** + * {@inheritdoc} + */ + public function safeDown() + { + echo "m201204_224340_add_title_sw_workflow to be reverted.\n"; + + + if($this->dropColumn('{{%sw_status}}', 'title')) + echo "m201204_224340_add_title_sw_workflow cannot be reverted.\n"; + + return false; + } + + /* + // Use up()/down() to run migration code without a transaction. + public function up() + { + + } + + public function down() + { + echo "m201204_224340_add_title_sw_workflow cannot be reverted.\n"; + + return false; + } + */ +} diff --git a/src/models/Metadata.php b/src/models/Metadata.php index c365572..d301dba 100644 --- a/src/models/Metadata.php +++ b/src/models/Metadata.php @@ -1,6 +1,6 @@ 32], + [['id','title'], 'required'], + [['id', 'initial_status_id','title'], 'string', 'max' => 32], [['initial_status_id'], 'exist', 'skipOnError' => true, 'targetClass' => Status::className(), 'targetAttribute' => ['initial_status_id' => 'id']] ]; } @@ -46,6 +46,7 @@ public function attributeLabels() return [ 'id' => Yii::t('app', 'ID'), 'initial_status_id' => Yii::t('app', 'Initial Status'), + 'title' => Yii::t('app', 'Title'), ]; } @@ -54,7 +55,7 @@ public function attributeLabels() */ public function getStatuses() { - return $this->hasMany(Status::className(), ['workflow_id' => 'id'])->orderBy(['sort_order' => SORT_ASC]); + return $this->hasMany(Status::class, ['workflow_id' => 'id'])->orderBy(['sort_order' => SORT_ASC]); } /** @@ -62,7 +63,7 @@ public function getStatuses() */ public function getInitialStatus() { - return $this->hasOne(Status::className(), ['id' => 'initial_status_id']); + return $this->hasOne(Status::class, ['id' => 'initial_status_id']); } /** @@ -70,7 +71,7 @@ public function getInitialStatus() */ public function getTransitions() { - return $this->hasMany(Transition::className(), ['workflow_id' => 'id']); + return $this->hasMany(Transition::class, ['workflow_id' => 'id']); } /** @@ -78,7 +79,7 @@ public function getTransitions() */ public function getMetadatas() { - return $this->hasMany(Metadata::className(), ['workflow_id' => 'id']); + return $this->hasMany(Metadata::class, ['workflow_id' => 'id']); } /** diff --git a/src/models/form/StatusForm.php b/src/models/form/StatusForm.php index 7fa04f9..af4d1af 100644 --- a/src/models/form/StatusForm.php +++ b/src/models/form/StatusForm.php @@ -1,9 +1,9 @@
@@ -20,8 +21,9 @@ errorSummary($model); ?> field($model, 'id')->textInput(['maxlength' => true]) ?> + field($model, 'title')->textInput(['maxlength' => true]) ?> - ' . ($model->isNewRecord ? Yii::t('workflow', 'Create') : Yii::t('workflow', 'Save')), [ + isNewRecord ? Yii::t('workflow', 'Create') : Yii::t('workflow', 'Save')), [ 'id' => 'save-' . $model->formName(), 'class' => 'btn btn-success' ]) ?> diff --git a/src/views/default/create.php b/src/views/default/create.php index bd73ca9..e55f125 100644 --- a/src/views/default/create.php +++ b/src/views/default/create.php @@ -1,10 +1,10 @@ title = Yii::t('workflow', 'Create'); $this->params['breadcrumbs'][] = ['label' => Yii::t('workflow', 'Workflow'), 'url' => ['index']]; diff --git a/src/views/default/index.php b/src/views/default/index.php index df0572d..b38553f 100644 --- a/src/views/default/index.php +++ b/src/views/default/index.php @@ -3,9 +3,10 @@ * @var yii\web\View $this */ -use cornernote\workflow\manager\models\Workflow; -use yii\bootstrap\Nav; -use yii\helpers\Html; +use victorsemenow\workflow\manager\models\Workflow; +use yii\bootstrap4\Nav; +use yii\bootstrap4\Html; +use kartik\icons\Icon; $this->title = Yii::t('workflow', 'Workflow'); $this->params['breadcrumbs'][] = $this->title; @@ -19,7 +20,7 @@ ' ' . Yii::t('workflow', 'Create'), + 'label' => Icon::show('plus').' ' . Yii::t('workflow', 'Create'), 'url' => ['create'], 'encode' => false, ], @@ -27,14 +28,14 @@ foreach (Workflow::find()->orderBy(['id' => SORT_ASC])->all() as $workflow) { /** @var Workflow $workflow */ $items[] = [ - 'label' => $workflow->id, + 'label' => $workflow->title.' ('.$workflow->id.')', 'url' => ['view', 'id' => $workflow->id], 'linkOptions' => ['style' => 'color:#fff;background:' . $workflow->getColor()], ]; } echo Nav::widget([ 'items' => $items, - 'options' => ['class' => 'nav-pills'], + 'options' => ['class' => 'nav nav-pills'], ]); ?> diff --git a/src/views/default/update.php b/src/views/default/update.php index 3d1088d..93a0620 100644 --- a/src/views/default/update.php +++ b/src/views/default/update.php @@ -1,10 +1,10 @@ title = $model->id; $this->params['breadcrumbs'][] = ['label' => Yii::t('workflow', 'Workflow'), 'url' => ['index']]; diff --git a/src/views/default/view.php b/src/views/default/view.php index 1a0ce15..3dd9567 100644 --- a/src/views/default/view.php +++ b/src/views/default/view.php @@ -1,11 +1,11 @@ title = $model->id; $this->params['breadcrumbs'][] = ['label' => Yii::t('workflow', 'Workflow'), 'url' => ['index']]; @@ -22,9 +24,9 @@

title) ?> -
- ' . Yii::t('workflow', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-info']) ?> - ' . Yii::t('workflow', 'Delete'), ['delete', 'id' => $model->id], [ +
+ $model->id], ['class' => 'btn btn-info']) ?> + $model->id], [ 'class' => 'btn btn-danger', 'data-confirm' => Yii::t('workflow', 'Are you sure?'), 'data-method' => 'post', @@ -38,20 +40,20 @@ $sortables = []; foreach ($model->statuses as $status) { $actions = []; - $actions[] = ''; + $actions[] = ''.Icon::show('sort').''; if ($model->initial_status_id != $status->id) { - $actions[] = Html::a('', ['initial', 'id' => $model->id, 'status_id' => $status->id], ['title' => Yii::t('workflow', 'Set Initial')]); + $actions[] = Html::a(Icon::show('star'), ['initial', 'id' => $model->id, 'status_id' => $status->id], ['title' => Yii::t('workflow', 'Set Initial')]); } - $actions[] = Html::a('', ['status/update', 'id' => $status->id, 'workflow_id' => $status->workflow_id], ['title' => Yii::t('workflow', 'Update')]); - $actions[] = Html::a('', ['status/delete', 'id' => $status->id, 'workflow_id' => $status->workflow_id], [ + $actions[] = Html::a(Icon::show('pencil-alt'), ['status/update', 'id' => $status->id, 'workflow_id' => $status->workflow_id], ['title' => Yii::t('workflow', 'Update')]); + $actions[] = Html::a(Icon::show('trash-alt'), ['status/delete', 'id' => $status->id, 'workflow_id' => $status->workflow_id], [ 'title' => Yii::t('workflow', 'Delete'), 'data-confirm' => Yii::t('workflow', 'Are you sure?'), 'data-method' => 'post', ]); - $transitions = $status->startTransitions ? '
   ' . implode(', ', ArrayHelper::map($status->startTransitions, 'end_status_id', 'endName')) . '' : ''; - $metadatas = $status->metadatas ? '
   ' . Json::encode(ArrayHelper::map($status->metadatas, 'key', 'value')) . '' : ''; + $transitions = $status->startTransitions ? '
'.Icon::show('chevron-right') .'   ' . implode(', ', ArrayHelper::map($status->startTransitions, 'end_status_id', 'endName')) . '' : ''; + $metadatas = $status->metadatas ? '
'. Icon::show('tags').'   ' . Json::encode(ArrayHelper::map($status->metadatas, 'key', 'value')) . '' : ''; $sortables[] = [ - 'content' => '
' . implode(' ', $actions) . '
' . $status->name . $transitions . $metadatas, + 'content' => '
' . implode(' ', $actions) . '
' . $status->name . $transitions . $metadatas, 'options' => [ 'id' => 'Status_' . $status->id, 'class' => 'list-group-item', @@ -88,7 +90,7 @@ $.ajax({ type: 'POST', url: '" . Url::to(['sort', 'id' => $model->id]) . "', - data: $(event.target).sortable('serialize') + '&_csrf=" . Yii::$app->request->getCsrfToken() . "', + data: $(event.target).sortable('serialize') + '&_csrf-backend=" . Yii::$app->request->getCsrfToken() . "', success: function() { location.reload(); } diff --git a/src/views/layouts/main.php b/src/views/layouts/main.php index 1a53c7f..3a9cca7 100644 --- a/src/views/layouts/main.php +++ b/src/views/layouts/main.php @@ -4,11 +4,16 @@ * @var $content string */ -use cornernote\workflow\manager\models\Workflow; -use yii\bootstrap\Nav; -use yii\bootstrap\NavBar; -use yii\helpers\Html; -use yii\widgets\Breadcrumbs; +use victorsemenow\workflow\manager\models\Workflow; +use yii\bootstrap4\Nav; +use yii\bootstrap4\NavBar; +use yii\bootstrap4\Html; +use yii\bootstrap4\Breadcrumbs; +use kartik\icons\FontAwesomeAsset; + + + + ?> beginPage() ?> @@ -18,7 +23,8 @@ <?= Html::encode($this->title) ?> - registerCss('body{padding-top: 60px; padding-bottom: 60px;}'); ?> + registerCss('body{padding-top: 60px; padding-bottom: 60px;}'); ?> + head() ?> @@ -28,7 +34,7 @@ NavBar::begin([ 'brandLabel' => Yii::t('workflow', 'Workflow'), 'brandUrl' => ['default/index'], - 'options' => ['class' => 'navbar-default navbar-fixed-top navbar-fluid'], + 'options' => ['class' => 'navbar navbar-expand-lg navbar-light bg-light'], 'innerContainerOptions' => ['class' => 'container-fluid'], ]); $items = []; @@ -41,7 +47,7 @@ } echo Nav::widget([ 'items' => $items, - 'options' => ['class' => 'navbar-nav'], + 'options' => ['class' => 'navbar-nav mr-auto'], ]); echo Nav::widget([ 'items' => [ diff --git a/src/views/status/_form-metadata.php b/src/views/status/_form-metadata.php index 6618da1..208f4d2 100644 --- a/src/views/status/_form-metadata.php +++ b/src/views/status/_form-metadata.php @@ -1,14 +1,15 @@ @@ -25,8 +26,8 @@ ])->label(false) ?> - ', 'javascript:void(0);', [ - 'class' => 'status-remove-metadata-button btn btn-default btn-xs', + 'status-remove-metadata-button btn btn-light btn-xs', 'title' => Yii::t('workflow', 'Remove {key}', ['key' => $key]), ]) ?> \ No newline at end of file diff --git a/src/views/status/_form.php b/src/views/status/_form.php index 8bdd7bd..7de4e3c 100644 --- a/src/views/status/_form.php +++ b/src/views/status/_form.php @@ -1,13 +1,14 @@ @@ -31,7 +32,7 @@ ' . Yii::t('workflow', 'New Metadata'), 'javascript:void(0);', [ + echo Html::a(Icon::show('plus'). ' ' . Yii::t('workflow', 'New Metadata'), 'javascript:void(0);', [ 'id' => 'status-new-metadata-button', 'class' => 'pull-right btn btn-default btn-xs' ]) @@ -90,11 +91,11 @@ - ' . ($model->status->isNewRecord ? Yii::t('workflow', 'Create') : Yii::t('workflow', 'Save')), [ + status->isNewRecord ? Yii::t('workflow', 'Create') : Yii::t('workflow', 'Save')), [ 'id' => 'save-' . $model->formName(), 'class' => 'btn btn-success' ]) ?> - $model->status->workflow_id], ['class' => 'btn btn-default']) ?> + $model->status->workflow_id], ['class' => 'btn btn-light']) ?> diff --git a/src/views/status/create.php b/src/views/status/create.php index 5a648ed..008bb4c 100644 --- a/src/views/status/create.php +++ b/src/views/status/create.php @@ -1,10 +1,10 @@ title = Yii::t('workflow', 'Create Status'); $this->params['breadcrumbs'][] = ['label' => Yii::t('workflow', 'Workflow'), 'url' => ['default/index']]; diff --git a/src/views/status/update.php b/src/views/status/update.php index 0170204..3a8de64 100644 --- a/src/views/status/update.php +++ b/src/views/status/update.php @@ -1,10 +1,10 @@ title = $model->status->id; $this->params['breadcrumbs'][] = ['label' => Yii::t('workflow', 'Workflow'), 'url' => ['default/index']];