Przeglądaj źródła

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

AntonLV 7 miesięcy temu
rodzic
commit
b000071b48

+ 1 - 0
modules/boonex/russian/data/langs/bx_tasks/ru.xml

@@ -471,6 +471,7 @@
     <string name="_bx_tasks_txt_msg_edit_state"><![CDATA[<a href="{author_link}">{author_name}</a> изменил состояние на <b>{value}</b>]]></string>
     <string name="_bx_tasks_txt_msg_completed"><![CDATA[<a href="{author_link}">{author_name}</a> завершил задачу]]></string>
     <string name="_bx_tasks_txt_msg_uncompleted"><![CDATA[<a href="{author_link}">{author_name}</a> повторно открыл задачу]]></string>
+    <string name="_bx_tasks_txt_msg_report_time_for_date"><![CDATA[<a href="{author_link}">{author_name}</a> сообщил, что {date} было потрачено {time}]]></string>
 
     <!-- Notifications -->
     <string name="_bx_tasks_alert_action_completed_personal"><![CDATA[Задание завершено]]></string>

+ 1 - 1
modules/boonex/tasks/classes/BxTasksConfig.php

@@ -312,7 +312,7 @@ class BxTasksConfig extends BxBaseModTextConfig
 
     public function getDueDateTitle($iValue)
     {
-        return bx_time_js($iValue, BX_FORMAT_DATE, true);
+        return bx_process_output($iValue, BX_DATA_DATE_TS);
     }
 
     public function getStateTitle($iValue)

+ 8 - 0
modules/boonex/tasks/classes/BxTasksTime.php

@@ -88,6 +88,14 @@ class BxTasksTime extends BxTemplReport
 
         $this->_trigger();
 
+        $this->_oModule->logActivity($iObjectId, [
+            'key' => '_bx_tasks_txt_msg_report_time_for_date', 
+            'markers' => [
+                'time' => $this->_oModule->_oConfig->timeI2S($aTrack['value']),
+                'date' => bx_process_output($aTrack['value_date'] ?: $aTrack['date'], BX_DATA_DATE_TS)
+            ]
+        ]);
+
         /**
          * @hooks
          * @hookdef bx_tasks-report_time '{module_name}', 'report_time' - hook on create new time report 

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

@@ -474,6 +474,7 @@
     <string name="_bx_tasks_txt_msg_edit_state"><![CDATA[<a href="{author_link}">{author_name}</a> changed state to <b>{value}</b>]]></string>
     <string name="_bx_tasks_txt_msg_completed"><![CDATA[<a href="{author_link}">{author_name}</a> completed the task]]></string>
     <string name="_bx_tasks_txt_msg_uncompleted"><![CDATA[<a href="{author_link}">{author_name}</a> re-opened the task]]></string>
+    <string name="_bx_tasks_txt_msg_report_time_for_date"><![CDATA[<a href="{author_link}">{author_name}</a> reported that {time} was spent on {date}]]></string>
 
     <!-- Notifications -->
     <string name="_bx_tasks_alert_action_completed_personal"><![CDATA[Complete task]]></string>