Browse Source

Adding sent date see #6877

Julio Montoya 11 years ago
parent
commit
7e60f29d04
2 changed files with 9 additions and 4 deletions
  1. 3 3
      main/inc/ajax/model.ajax.php
  2. 6 1
      main/work/work.lib.php

+ 3 - 3
main/inc/ajax/model.ajax.php

@@ -484,7 +484,7 @@ switch ($action) {
         }
         break;
     case 'get_work_teacher':
-        $columns = array('type', 'title', 'expires_on', 'ends_on', 'actions');
+        $columns = array('type', 'title', 'sent_date', 'expires_on', 'ends_on', 'actions');
         $result = getWorkListTeacher($start, $limit, $sidx, $sord, $where_condition);
         break;
     case 'get_work_student':
@@ -1056,12 +1056,12 @@ if (in_array($action, $allowed_actions)) {
         }
         switch ($export_format) {
             case 'xls':
-                $file_name = (!empty($action)) ? $action : 'company_report'; 
+                $file_name = (!empty($action)) ? $action : 'company_report';
                 Export::export_table_xls($array, $file_name);
                 break;
             case 'csv':
             default:
-                $file_name = (!empty($action)) ? $action : 'company_report'; 
+                $file_name = (!empty($action)) ? $action : 'company_report';
                 Export::export_table_csv($array, $file_name);
                 break;
         }

+ 6 - 1
main/work/work.lib.php

@@ -423,7 +423,6 @@ function getUniqueStudentAttempts($workId, $groupId, $course_id, $sessionId, $us
  * @param $work_parents
  * @param $origin
  * @param array $userList
- * @deprecated
  */
 function display_student_publications_list($id, $my_folder_data, $work_parents, $origin, $userList = array())
 {
@@ -747,6 +746,7 @@ function showTeacherWorkGrid()
     $columnModel = array(
         array('name'=>'type', 'index'=>'type', 'width'=>'50', 'align'=>'left', 'sortable' => 'false'),
         array('name'=>'title', 'index'=>'title',  'width'=>'300',   'align'=>'left'),
+        array('name'=>'sent_date', 'index'=>'sent_date', 'width'=>'150',  'align'=>'left'),
         array('name'=>'expires_on', 'index'=>'expires_on', 'width'=>'150',  'align'=>'left'),
         array('name'=>'end_on', 'index'=>'end_on', 'width'=>'150',  'align'=>'left'),
         array('name'=>'actions', 'index'=>'actions', 'width'=>'150', 'align'=>'left', 'sortable'=>'false')
@@ -759,6 +759,7 @@ function showTeacherWorkGrid()
     $columns = array(
         get_lang('Type'),
         get_lang('Title'),
+        get_lang('SentDate'),
         get_lang('HandOutDateLimit'),
         get_lang('HandedOut'),
         get_lang('Actions')
@@ -1648,11 +1649,15 @@ function getWorkListTeacher($start, $limit, $column, $direction, $where_conditio
             $work['type'] = Display::return_icon('work.png');
             $work['expires_on'] = $work['expires_on']  == '0000-00-00 00:00:00' ? null : api_get_local_time($work['expires_on']);
             $work['ends_on'] = $work['ends_on']  == '0000-00-00 00:00:00' ? null : api_get_local_time($work['ends_on']);
+
             if (empty($work['title'])) {
                 $work['title'] = basename($work['url']);
             }
             $work['title'] = Display::url($work['title'], $url.'&id='.$workId);
 
+            $work['title'] .= ' '.Display::label(get_count_work($work['id']), 'success');
+            $work['sent_date'] = date_to_str_ago($work['sent_date']).' <br />'.api_get_local_time($work['sent_date']);
+
             $editLink = Display::url(
                 Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL),
                 api_get_path(WEB_CODE_PATH).'work/edit_work.php?id='.$workId.'&'.api_get_cidreq()