Skip to content

Commit 58b4627

Browse files
LedZeppe1inLedZeppe1in
committed
Add new migrations and models, and update user migration and model
1 parent 9579240 commit 58b4627

18 files changed

+1012
-11
lines changed

‎messages/en/app.php

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
'LANG_MODEL_LOCAL' => 'Local',
9090
'LANG_MODEL_NAME' => 'Name',
9191
'LANG_MODEL_DEFAULT' => 'Default language',
92-
9392
/* User */
9493
'USER_MODEL_ID' => 'ID',
9594
'USER_MODEL_CREATED_AT' => 'Created at',
@@ -100,11 +99,60 @@
10099
'USER_MODEL_EMAIL_CONFIRM_TOKEN' => 'E-mail confirm token',
101100
'USER_MODEL_PASSWORD_HASH' => 'Password hash',
102101
'USER_MODEL_PASSWORD_RESET_TOKEN' => 'Password reset token',
102+
'USER_MODEL_TYPE' => 'Type',
103103
'USER_MODEL_STATUS' => 'Status',
104104
'USER_MODEL_FULL_NAME' => 'Full name',
105105
'USER_MODEL_EMAIL' => 'E-mail',
106+
'USER_MODEL_DISCIPLINE' => 'Discipline',
107+
'USER_MODEL_COMPETENCE' => 'Competence',
106108
/* Сообщения модели User */
107109
'USER_MODEL_MESSAGE_USERNAME' => 'This username has already been taken.',
108110
'USER_MODEL_MESSAGE_UPDATED_YOUR_DETAILS' => 'You have successfully changed your details.',
109111
'USER_MODEL_MESSAGE_UPDATED_YOUR_PASSWORD' => 'You have successfully changed password.',
112+
/* Task */
113+
'TASK_MODEL_ID' => 'ID',
114+
'TASK_MODEL_CREATED_AT' => 'Created at',
115+
'TASK_MODEL_UPDATED_AT' => 'Updated at',
116+
'TASK_MODEL_NAME' => 'Name',
117+
'TASK_MODEL_DESCRIPTION' => 'Description',
118+
/* Alternative */
119+
'ALTERNATIVE_MODEL_ID' => 'ID',
120+
'ALTERNATIVE_MODEL_CREATED_AT' => 'Created at',
121+
'ALTERNATIVE_MODEL_UPDATED_AT' => 'Updated at',
122+
'ALTERNATIVE_MODEL_NAME' => 'Name',
123+
'ALTERNATIVE_MODEL_DESCRIPTION' => 'Description',
124+
'ALTERNATIVE_MODEL_TASK' => 'Task',
125+
/* Criteria */
126+
'CRITERIA_MODEL_ID' => 'ID',
127+
'CRITERIA_MODEL_CREATED_AT' => 'Created at',
128+
'CRITERIA_MODEL_UPDATED_AT' => 'Updated at',
129+
'CRITERIA_MODEL_NAME' => 'Name',
130+
'CRITERIA_MODEL_DESCRIPTION' => 'Description',
131+
'CRITERIA_MODEL_TASK' => 'Task',
132+
/* CriteriaValue */
133+
'CRITERIA_VALUE_MODEL_ID' => 'ID',
134+
'CRITERIA_VALUE_MODEL_CREATED_AT' => 'Created at',
135+
'CRITERIA_VALUE_MODEL_UPDATED_AT' => 'Updated at',
136+
'CRITERIA_VALUE_MODEL_PRIORITY' => 'Priority',
137+
'CRITERIA_VALUE_MODEL_VALUE' => 'Value',
138+
'CRITERIA_VALUE_MODEL_CRITERIA' => 'Criteria',
139+
/* SpecificAlternative */
140+
'SPECIFIC_ALTERNATIVE_MODEL_ID' => 'ID',
141+
'SPECIFIC_ALTERNATIVE_MODEL_CREATED_AT' => 'Created at',
142+
'SPECIFIC_ALTERNATIVE_MODEL_UPDATED_AT' => 'Updated at',
143+
'SPECIFIC_ALTERNATIVE_MODEL_ALTERNATIVE' => 'Alternative',
144+
'SPECIFIC_ALTERNATIVE_MODEL_CRITERIA' => 'Criteria',
145+
/* Decision */
146+
'DECISION_MODEL_ID' => 'ID',
147+
'DECISION_MODEL_CREATED_AT' => 'Created at',
148+
'DECISION_MODEL_UPDATED_AT' => 'Updated at',
149+
'DECISION_MODEL_TASK' => 'Task',
150+
'DECISION_MODEL_USER' => 'User',
151+
/* Evaluation */
152+
'EVALUATION_MODEL_ID' => 'ID',
153+
'EVALUATION_MODEL_CREATED_AT' => 'Created at',
154+
'EVALUATION_MODEL_UPDATED_AT' => 'Updated at',
155+
'EVALUATION_MODEL_EVALUATION' => 'Evaluation',
156+
'EVALUATION_MODEL_DECISION' => 'Decision',
157+
'EVALUATION_MODEL_ALTERNATIVE' => 'Alternative',
110158
];

‎messages/ru/app.php

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
'LANG_MODEL_LOCAL' => 'Локаль',
9090
'LANG_MODEL_NAME' => 'Название',
9191
'LANG_MODEL_DEFAULT' => 'Язык по умолчанию',
92-
9392
/* User */
9493
'USER_MODEL_ID' => 'ID',
9594
'USER_MODEL_CREATED_AT' => 'Зарегистрирован',
@@ -100,11 +99,60 @@
10099
'USER_MODEL_EMAIL_CONFIRM_TOKEN' => 'Метка подтверждения электронной почты',
101100
'USER_MODEL_PASSWORD_HASH' => 'Хэш пароля',
102101
'USER_MODEL_PASSWORD_RESET_TOKEN' => 'Метка сброса пароля',
102+
'USER_MODEL_TYPE' => 'Тип',
103103
'USER_MODEL_STATUS' => 'Статус',
104104
'USER_MODEL_FULL_NAME' => 'Фамилия Имя Отчество',
105105
'USER_MODEL_EMAIL' => 'Электронная почта',
106+
'USER_MODEL_DISCIPLINE' => 'Область интересов',
107+
'USER_MODEL_COMPETENCE' => 'Компетентность',
106108
/* Сообщения модели User */
107109
'USER_MODEL_MESSAGE_USERNAME' => 'Это имя пользователя уже занято.',
108110
'USER_MODEL_MESSAGE_UPDATED_YOUR_DETAILS' => 'Вы успешно изменили свои данные.',
109111
'USER_MODEL_MESSAGE_UPDATED_YOUR_PASSWORD' => 'Вы успешно изменили пароль.',
112+
/* Task */
113+
'TASK_MODEL_ID' => 'ID',
114+
'TASK_MODEL_CREATED_AT' => 'Создана',
115+
'TASK_MODEL_UPDATED_AT' => 'Обновлена',
116+
'TASK_MODEL_NAME' => 'Название',
117+
'TASK_MODEL_DESCRIPTION' => 'Описание',
118+
/* Alternative */
119+
'ALTERNATIVE_MODEL_ID' => 'ID',
120+
'ALTERNATIVE_MODEL_CREATED_AT' => 'Создана',
121+
'ALTERNATIVE_MODEL_UPDATED_AT' => 'Обновлена',
122+
'ALTERNATIVE_MODEL_NAME' => 'Название',
123+
'ALTERNATIVE_MODEL_DESCRIPTION' => 'Описание',
124+
'ALTERNATIVE_MODEL_TASK' => 'Задача',
125+
/* Criteria */
126+
'CRITERIA_MODEL_ID' => 'ID',
127+
'CRITERIA_MODEL_CREATED_AT' => 'Создан',
128+
'CRITERIA_MODEL_UPDATED_AT' => 'Обновлен',
129+
'CRITERIA_MODEL_NAME' => 'Название',
130+
'CRITERIA_MODEL_DESCRIPTION' => 'Описание',
131+
'CRITERIA_MODEL_TASK' => 'Задача',
132+
/* CriteriaValue */
133+
'CRITERIA_VALUE_MODEL_ID' => 'ID',
134+
'CRITERIA_VALUE_MODEL_CREATED_AT' => 'Создано',
135+
'CRITERIA_VALUE_MODEL_UPDATED_AT' => 'Обновлено',
136+
'CRITERIA_VALUE_MODEL_PRIORITY' => 'Приоритет',
137+
'CRITERIA_VALUE_MODEL_VALUE' => 'Значение',
138+
'CRITERIA_VALUE_MODEL_CRITERIA' => 'Критерий',
139+
/* SpecificAlternative */
140+
'SPECIFIC_ALTERNATIVE_MODEL_ID' => 'ID',
141+
'SPECIFIC_ALTERNATIVE_MODEL_CREATED_AT' => 'Создана',
142+
'SPECIFIC_ALTERNATIVE_MODEL_UPDATED_AT' => 'Обновлена',
143+
'SPECIFIC_ALTERNATIVE_MODEL_ALTERNATIVE' => 'Альтернатива',
144+
'SPECIFIC_ALTERNATIVE_MODEL_CRITERIA' => 'Критерий',
145+
/* Decision */
146+
'DECISION_MODEL_ID' => 'ID',
147+
'DECISION_MODEL_CREATED_AT' => 'Создано',
148+
'DECISION_MODEL_UPDATED_AT' => 'Обновлено',
149+
'DECISION_MODEL_TASK' => 'Задача',
150+
'DECISION_MODEL_USER' => 'Пользователь',
151+
/* Evaluation */
152+
'EVALUATION_MODEL_ID' => 'ID',
153+
'EVALUATION_MODEL_CREATED_AT' => 'Создана',
154+
'EVALUATION_MODEL_UPDATED_AT' => 'Обновлена',
155+
'EVALUATION_MODEL_EVALUATION' => 'Задача',
156+
'EVALUATION_MODEL_DECISION' => 'Решение',
157+
'EVALUATION_MODEL_ALTERNATIVE' => 'Альтернатива',
110158
];

‎migrations/m200530_084913_user.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,12 @@ public function up()
2222
'email_confirm_token' => $this->string(),
2323
'password_hash' => $this->string()->notNull(),
2424
'password_reset_token' => $this->string(),
25+
'type' => $this->smallInteger()->notNull()->defaultValue(0),
2526
'status' => $this->smallInteger()->notNull()->defaultValue(0),
2627
'full_name' => $this->string()->notNull(),
2728
'email' => $this->string(),
29+
'discipline' => $this->string(),
30+
'competence' => $this->text(),
2831
], $tableOptions);
2932

3033
$this->createIndex('idx_user_username', '{{%user}}', 'username');

‎migrations/m200530_113235_task.php

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?php
2+
3+
use yii\db\Migration;
4+
5+
/**
6+
* Class m200530_113235_task
7+
*/
8+
class m200530_113235_task extends Migration
9+
{
10+
public function up()
11+
{
12+
$tableOptions = null;
13+
if ($this->db->driverName === 'mysql')
14+
$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB';
15+
16+
$this->createTable('{{%task}}', [
17+
'id' => $this->primaryKey(),
18+
'created_at' => $this->integer()->notNull(),
19+
'updated_at' => $this->integer()->notNull(),
20+
'name' => $this->string()->notNull(),
21+
'description' => $this->text(),
22+
], $tableOptions);
23+
24+
$this->createIndex('idx_task_name', '{{%task}}', 'name');
25+
}
26+
27+
public function down()
28+
{
29+
$this->dropTable('{{%task}}');
30+
}
31+
}

‎migrations/m200530_113456_alternative.php

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
3+
use yii\db\Migration;
4+
5+
/**
6+
* Class m200530_113456_alternative
7+
*/
8+
class m200530_113456_alternative extends Migration
9+
{
10+
public function up()
11+
{
12+
$tableOptions = null;
13+
if ($this->db->driverName === 'mysql')
14+
$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB';
15+
16+
$this->createTable('{{%alternative}}', [
17+
'id' => $this->primaryKey(),
18+
'created_at' => $this->integer()->notNull(),
19+
'updated_at' => $this->integer()->notNull(),
20+
'name' => $this->string()->notNull(),
21+
'description' => $this->text(),
22+
'task_id' => $this->integer()->notNull(),
23+
], $tableOptions);
24+
25+
$this->createIndex('idx_alternative_name', '{{%alternative}}', 'name');
26+
27+
$this->addForeignKey("alternative_task_fk", "{{%alternative}}", "task_id",
28+
"{{%task}}", "id", 'CASCADE');
29+
}
30+
31+
public function down()
32+
{
33+
$this->dropTable('{{%alternative}}');
34+
}
35+
}

‎migrations/m200530_113721_criteria.php

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
3+
use yii\db\Migration;
4+
5+
/**
6+
* Class m200530_113721_criteria
7+
*/
8+
class m200530_113721_criteria extends Migration
9+
{
10+
public function up()
11+
{
12+
$tableOptions = null;
13+
if ($this->db->driverName === 'mysql')
14+
$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB';
15+
16+
$this->createTable('{{%criteria}}', [
17+
'id' => $this->primaryKey(),
18+
'created_at' => $this->integer()->notNull(),
19+
'updated_at' => $this->integer()->notNull(),
20+
'name' => $this->string()->notNull(),
21+
'description' => $this->text(),
22+
'task_id' => $this->integer()->notNull(),
23+
], $tableOptions);
24+
25+
$this->createIndex('idx_criteria_name', '{{%criteria}}', 'name');
26+
27+
$this->addForeignKey("criteria_task_fk", "{{%criteria}}", "task_id",
28+
"{{%task}}", "id", 'CASCADE');
29+
}
30+
31+
public function down()
32+
{
33+
$this->dropTable('{{%criteria}}');
34+
}
35+
}

‎migrations/m200530_113823_criteria_value.php

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?php
2+
3+
use yii\db\Migration;
4+
5+
/**
6+
* Class m200530_113823_criteria_value
7+
*/
8+
class m200530_113823_criteria_value extends Migration
9+
{
10+
public function up()
11+
{
12+
$tableOptions = null;
13+
if ($this->db->driverName === 'mysql')
14+
$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB';
15+
16+
$this->createTable('{{%criteria_value}}', [
17+
'id' => $this->primaryKey(),
18+
'created_at' => $this->integer()->notNull(),
19+
'updated_at' => $this->integer()->notNull(),
20+
'priority' => $this->integer()->notNull(),
21+
'value' => $this->text()->notNull(),
22+
'criteria_id' => $this->integer()->notNull(),
23+
], $tableOptions);
24+
25+
$this->addForeignKey("criteria_value_criteria_fk", "{{%criteria_value}}", "criteria_id",
26+
"{{%criteria}}", "id", 'CASCADE');
27+
}
28+
29+
public function down()
30+
{
31+
$this->dropTable('{{%criteria_value}}');
32+
}
33+
}

‎migrations/m200530_115530_specific_alternative.php

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?php
2+
3+
use yii\db\Migration;
4+
5+
/**
6+
* Class m200530_115530_specific_alternative
7+
*/
8+
class m200530_115530_specific_alternative extends Migration
9+
{
10+
public function up()
11+
{
12+
$tableOptions = null;
13+
if ($this->db->driverName === 'mysql')
14+
$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB';
15+
16+
$this->createTable('{{%specific_alternative}}', [
17+
'id' => $this->primaryKey(),
18+
'created_at' => $this->integer()->notNull(),
19+
'updated_at' => $this->integer()->notNull(),
20+
'alternative_id' => $this->integer()->notNull(),
21+
'criteria_id' => $this->integer()->notNull(),
22+
], $tableOptions);
23+
24+
$this->addForeignKey("specific_alternative_alternative_fk", "{{%specific_alternative}}",
25+
"alternative_id", "{{%alternative}}", "id", 'CASCADE');
26+
$this->addForeignKey("specific_alternative_criteria_fk", "{{%specific_alternative}}",
27+
"criteria_id", "{{%criteria}}", "id", 'CASCADE');
28+
}
29+
30+
public function down()
31+
{
32+
$this->dropTable('{{%specific_alternative}}');
33+
}
34+
}

‎migrations/m200530_115744_decision.php

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?php
2+
3+
use yii\db\Migration;
4+
5+
/**
6+
* Class m200530_115744_decision
7+
*/
8+
class m200530_115744_decision extends Migration
9+
{
10+
public function up()
11+
{
12+
$tableOptions = null;
13+
if ($this->db->driverName === 'mysql')
14+
$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB';
15+
16+
$this->createTable('{{%decision}}', [
17+
'id' => $this->primaryKey(),
18+
'created_at' => $this->integer()->notNull(),
19+
'updated_at' => $this->integer()->notNull(),
20+
'task_id' => $this->integer()->notNull(),
21+
'user_id' => $this->integer()->notNull(),
22+
], $tableOptions);
23+
24+
$this->addForeignKey("decision_task_fk", "{{%decision}}", "task_id",
25+
"{{%task}}", "id", 'CASCADE');
26+
$this->addForeignKey("decision_user_fk", "{{%decision}}", "user_id",
27+
"{{%user}}", "id", 'CASCADE');
28+
}
29+
30+
public function down()
31+
{
32+
$this->dropTable('{{%decision}}');
33+
}
34+
}

0 commit comments

Comments
 (0)