|
@@ -191,6 +191,13 @@ function get_work_data_by_id($id, $courseId = null, $sessionId = null)
|
|
|
$work['show_content'] = '<img src="'.$work['show_url'].'"/>';
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ $fieldValue = new ExtraFieldValue('work');
|
|
|
+ $work['extra'] = $fieldValue->getAllValuesForAnItem(
|
|
|
+ $id,
|
|
|
+ true
|
|
|
+ );
|
|
|
+
|
|
|
}
|
|
|
|
|
|
return $work;
|
|
@@ -2061,10 +2068,11 @@ function get_work_user_list(
|
|
|
|
|
|
// Date.
|
|
|
$work_date = api_convert_and_format_date($work['sent_date']);
|
|
|
- $date = date_to_str_ago($work['sent_date']). ' ' . $add_string . ' ' . $work_date;
|
|
|
+ $date = date_to_str_ago($work['sent_date']). ' ' . $work_date;
|
|
|
+ $work['formatted_date'] = $work_date . ' - ' . $add_string;
|
|
|
|
|
|
$work['sent_date_from_db'] = $work['sent_date'];
|
|
|
- $work['sent_date'] = '<div class="work-date" title="'.$date.'">' . $work['sent_date'] . '</div>';
|
|
|
+ $work['sent_date'] = '<div class="work-date" title="'.$date.'">' . $add_string . ' - ' . $work['sent_date'] . '</div>';
|
|
|
|
|
|
// Actions.
|
|
|
$correction = '';
|
|
@@ -3838,6 +3846,12 @@ function addDir($formValues, $user_id, $courseInfo, $groupId, $session_id)
|
|
|
$groupIid
|
|
|
);
|
|
|
|
|
|
+ // Added the new Work ID to the extra field values
|
|
|
+ $formValues['item_id'] = $workTable->getIid();
|
|
|
+
|
|
|
+ $workFieldValue = new ExtraFieldValue('work');
|
|
|
+ $workFieldValue->saveFieldValues($formValues);
|
|
|
+
|
|
|
if (api_get_course_setting('email_alert_students_on_new_homework') == 1) {
|
|
|
send_email_on_homework_creation(
|
|
|
$course_id,
|
|
@@ -3899,6 +3913,9 @@ function updateWork($workId, $params, $courseInfo, $sessionId = 0)
|
|
|
)
|
|
|
)
|
|
|
);
|
|
|
+
|
|
|
+ $workFieldValue = new ExtraFieldValue('work');
|
|
|
+ $workFieldValue->saveFieldValues($params);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -4180,9 +4197,10 @@ function deleteWorkItem($item_id, $courseInfo)
|
|
|
/**
|
|
|
* @param FormValidator $form
|
|
|
* @param array $defaults
|
|
|
+ * @param integer $workId
|
|
|
* @return FormValidator
|
|
|
*/
|
|
|
-function getFormWork($form, $defaults = array())
|
|
|
+function getFormWork($form, $defaults = array(), $workId = 0)
|
|
|
{
|
|
|
$sessionId = api_get_session_id();
|
|
|
if (!empty($defaults)) {
|
|
@@ -4267,6 +4285,17 @@ function getFormWork($form, $defaults = array())
|
|
|
$form->addElement('checkbox', 'add_to_calendar', null, get_lang('AddToCalendar'));
|
|
|
$form->addElement('select', 'allow_text_assignment', get_lang('DocumentType'), getUploadDocumentType());
|
|
|
|
|
|
+ //Extra fields
|
|
|
+ $extra_field = new ExtraField('work');
|
|
|
+ $extra = $extra_field->addElements($form, $workId);
|
|
|
+
|
|
|
+ $htmlHeadXtra[] = '
|
|
|
+ <script>
|
|
|
+ $(function() {
|
|
|
+ ' . $extra['jquery_ready_content'] . '
|
|
|
+ });
|
|
|
+ </script>';
|
|
|
+
|
|
|
$form->addHtml('</div>');
|
|
|
|
|
|
if (isset($defaults['enableExpiryDate']) && isset($defaults['enableEndDate'])) {
|