Просмотр исходного кода

Ticket #5425 - Tasks: Functionality improvements. Stage 2.

AntonLV 7 месяцев назад
Родитель
Сommit
4e81975ca8

+ 10 - 3
modules/boonex/russian/data/langs/bx_tasks/ru.xml

@@ -21,7 +21,7 @@
     <string name="_bx_tasks_form_entry_display_edit_body"><![CDATA[Редактировать тело задачи]]></string>
     <string name="_bx_tasks_form_entry_display_edit_type"><![CDATA[Редактировать тип задачи]]></string>
     <string name="_bx_tasks_form_entry_display_edit_priority"><![CDATA[Редактировать приоритет задачи]]></string>
-    <string name="_bx_tasks_form_entry_display_edit_estimate"><![CDATA[Редактировать временные затраты задачи]]></string>
+    <string name="_bx_tasks_form_entry_display_edit_estimate"><![CDATA[Редактировать временные оценки задачи]]></string>
     <string name="_bx_tasks_form_entry_display_edit_due_date"><![CDATA[Редактировать срок выполнения задачи]]></string>
     <string name="_bx_tasks_form_entry_display_edit_state"><![CDATA[Редактировать состояние задачи]]></string>
     <string name="_bx_tasks_form_entry_display_delete"><![CDATA[Удалить задание]]></string>
@@ -88,8 +88,8 @@
     <string name="_bx_tasks_form_entry_input_initial_members"><![CDATA[Назначить на]]></string>
     <string name="_bx_tasks_form_entry_input_sys_date_due_date"><![CDATA[Срок]]></string>
     <string name="_bx_tasks_form_entry_input_date_due_date"><![CDATA[Срок]]></string>
-    <string name="_bx_tasks_form_entry_input_sys_estimate"><![CDATA[Временные затраты]]></string>
-    <string name="_bx_tasks_form_entry_input_estimate"><![CDATA[Временные затраты (в часах)]]></string>
+    <string name="_bx_tasks_form_entry_input_sys_estimate"><![CDATA[Временные оценки]]></string>
+    <string name="_bx_tasks_form_entry_input_estimate"><![CDATA[Временные оценки (в баллах)]]></string>
 
     <string name="_bx_tasks_form_list_entry"><![CDATA[Списки заданий]]></string>
     <string name="_bx_tasks_form_list_entry_display_add"><![CDATA[Добавить Список заданий]]></string>
@@ -395,6 +395,13 @@
     <string name="_bx_tasks_priority_3"><![CDATA[Средний]]></string>
     <string name="_bx_tasks_priority_4"><![CDATA[Низкий]]></string>
     <string name="_bx_tasks_priority_5"><![CDATA[Нет приоритета]]></string>
+    <string name="_bx_tasks_pre_lists_estimates"><![CDATA[Оценки времени]]></string>
+    <string name="_bx_tasks_estimate_2"><![CDATA[2 балла]]></string>
+    <string name="_bx_tasks_estimate_4"><![CDATA[4 балла]]></string>
+    <string name="_bx_tasks_estimate_8"><![CDATA[8 баллов]]></string>
+    <string name="_bx_tasks_estimate_16"><![CDATA[16 баллов]]></string>
+    <string name="_bx_tasks_estimate_32"><![CDATA[32 балла]]></string>
+    <string name="_bx_tasks_estimate_64"><![CDATA[64 балла]]></string>
     <string name="_bx_tasks_pre_lists_states"><![CDATA[Состояния]]></string>
     <string name="_bx_tasks_state_1"><![CDATA[Отставание]]></string>
     <string name="_bx_tasks_state_2"><![CDATA[Запланировано]]></string>

+ 8 - 1
modules/boonex/tasks/install/langs/en.xml

@@ -89,7 +89,7 @@
     <string name="_bx_tasks_form_entry_input_sys_date_due_date"><![CDATA[Due date]]></string>
     <string name="_bx_tasks_form_entry_input_date_due_date"><![CDATA[Due date]]></string>
     <string name="_bx_tasks_form_entry_input_sys_estimate"><![CDATA[Estimate]]></string>
-    <string name="_bx_tasks_form_entry_input_estimate"><![CDATA[Estimate (in hours)]]></string>
+    <string name="_bx_tasks_form_entry_input_estimate"><![CDATA[Estimate (in points)]]></string>
 
     <string name="_bx_tasks_form_list_entry"><![CDATA[Tasklists]]></string>
     <string name="_bx_tasks_form_list_entry_display_add"><![CDATA[Add Tasklist]]></string>
@@ -398,6 +398,13 @@
     <string name="_bx_tasks_priority_3"><![CDATA[Medium]]></string>
     <string name="_bx_tasks_priority_4"><![CDATA[Low]]></string>
     <string name="_bx_tasks_priority_5"><![CDATA[No Priority]]></string>
+    <string name="_bx_tasks_pre_lists_estimates"><![CDATA[Estimates]]></string>
+    <string name="_bx_tasks_estimate_2"><![CDATA[2 points]]></string>
+    <string name="_bx_tasks_estimate_4"><![CDATA[4 points]]></string>
+    <string name="_bx_tasks_estimate_8"><![CDATA[8 points]]></string>
+    <string name="_bx_tasks_estimate_16"><![CDATA[16 points]]></string>
+    <string name="_bx_tasks_estimate_32"><![CDATA[32 points]]></string>
+    <string name="_bx_tasks_estimate_64"><![CDATA[64 points]]></string>
     <string name="_bx_tasks_pre_lists_states"><![CDATA[States]]></string>
     <string name="_bx_tasks_state_1"><![CDATA[Backlog]]></string>
     <string name="_bx_tasks_state_2"><![CDATA[Todo]]></string>

+ 13 - 1
modules/boonex/tasks/install/sql/install.sql

@@ -449,7 +449,7 @@ INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `ch
 ('bx_tasks', 'bx_tasks', 'changed', '', '', 0, 'datetime', '_bx_tasks_form_entry_input_sys_date_changed', '_bx_tasks_form_entry_input_date_changed', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_tasks', 'bx_tasks', 'published', '', '', 0, 'datetime', '_bx_tasks_form_entry_input_sys_date_published', '_bx_tasks_form_entry_input_date_published', '_bx_tasks_form_entry_input_date_published_info', 0, 0, 0, '', '', '', '', '', '', 'DateTimeTs', '', 1, 0),
 ('bx_tasks', 'bx_tasks', 'initial_members', '', '', 0, 'custom', '_bx_tasks_form_entry_input_sys_initial_members', '_bx_tasks_form_entry_input_initial_members', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 1),
-('bx_tasks', 'bx_tasks', 'estimate', '', '', 0, 'text', '_bx_tasks_form_entry_input_sys_estimate', '_bx_tasks_form_entry_input_estimate', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
+('bx_tasks', 'bx_tasks', 'estimate', '', '#!bx_tasks_estimates', 0, 'select', '_bx_tasks_form_entry_input_sys_estimate', '_bx_tasks_form_entry_input_estimate', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_tasks', 'bx_tasks', 'due_date', '', '', 0, 'datetime', '_bx_tasks_form_entry_input_sys_date_due_date', '_bx_tasks_form_entry_input_date_due_date', '', 0, 0, 0, '', '', '', '', '', '', 'DateTimeUtc', '', 1, 0),
 ('bx_tasks', 'bx_tasks', 'attachments', '', '', 0, 'custom', '_bx_tasks_form_entry_input_sys_attachments', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_tasks', 'bx_tasks', 'labels', '', '', 0, 'custom', '_sys_form_input_sys_labels', '_sys_form_input_labels', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -620,6 +620,18 @@ INSERT INTO `sys_form_pre_values`(`Key`, `Value`, `Order`, `LKey`, `LKey2`) VALU
 ('bx_tasks_priorities', '4', 4, '_bx_tasks_priority_4', ''),
 ('bx_tasks_priorities', '5', 5, '_bx_tasks_priority_5', '');
 
+INSERT INTO `sys_form_pre_lists`(`key`, `title`, `module`, `use_for_sets`) VALUES
+('bx_tasks_estimates', '_bx_tasks_pre_lists_estimates', 'bx_tasks', '0');
+
+INSERT INTO `sys_form_pre_values`(`Key`, `Value`, `Order`, `LKey`, `LKey2`) VALUES
+('bx_tasks_estimates', '', 0, '_sys_please_select', ''),
+('bx_tasks_estimates', '2', 1, '_bx_tasks_estimate_2', ''),
+('bx_tasks_estimates', '4', 1, '_bx_tasks_estimate_4', ''),
+('bx_tasks_estimates', '8', 1, '_bx_tasks_estimate_8', ''),
+('bx_tasks_estimates', '16', 1, '_bx_tasks_estimate_16', ''),
+('bx_tasks_estimates', '32', 1, '_bx_tasks_estimate_32', ''),
+('bx_tasks_estimates', '64', 1, '_bx_tasks_estimate_64', '');
+
 INSERT INTO `sys_form_pre_lists`(`key`, `title`, `module`, `use_for_sets`) VALUES
 ('bx_tasks_states', '_bx_tasks_pre_lists_states', 'bx_tasks', '0');