chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Feedback UI changes see BT#9017

Browse Source
1.9.x
Julio Montoya 11 years ago
parent b413bc7e33
commit 85490244f0
6 changed files with 209 additions and 71 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 33
      main/inc/ajax/model.ajax.php
  2. 2
      main/work/student_work.php
  3. 11
      main/work/work.lib.php
  4. 4
      main/work/work.php
  5. 43
      main/work/work_list.php
  6. 187
      main/work/work_list_all.php

33
main/inc/ajax/model.ajax.php
Unescape View File

@ -578,10 +578,36 @@ switch ($action) {
case 'get_work_user_list_all':
if (isset($_GET['type']) && $_GET['type'] == 'simple') {
$columns = array(
'type', 'firstname', 'lastname', 'title', 'qualification', 'sent_date', 'qualificator_id', 'actions'
'type',
'firstname',
'lastname',
'title',
'qualification',
'sent_date',
'qualificator_id',
'actions'
);
} else {
$columns = array('type', 'firstname', 'lastname', 'title', 'sent_date', 'actions');
$columns = array(
'type',
'firstname',
'lastname',
'title',
'sent_date',
'actions'
);
if (ALLOW_USER_COMMENTS) {
$columns = array(
'type',
'firstname',
'lastname',
'title',
'qualification',
'sent_date',
'actions'
);
}
}
$result = get_work_user_list($start, $limit, $sidx, $sord, $work_id, $whereCondition);
break;
@ -603,6 +629,9 @@ switch ($action) {
);
} else {
$columns = array('type', 'title', 'sent_date', 'actions');
if (ALLOW_USER_COMMENTS) {
$columns = array('type', 'title', 'qualification', 'sent_date', 'actions');
}
}
$documents = getAllDocumentToWork($work_id, api_get_course_int_id());

2
main/work/student_work.php
Unescape View File

@ -162,7 +162,7 @@ foreach ($workPerUser as $work) {
$column++;
$score = '-';
if (!empty($scoreWeight)) {
$score = strip_tags($userResult['qualification']);
$score = $userResult['qualification'];
}
$table->setCellContents($row, $column, $score);
$column++;

11
main/work/work.lib.php
Unescape View File

@ -2179,7 +2179,6 @@ function get_work_user_list(
$locked = api_resource_is_locked_by_gradebook($work_id, LINK_STUDENTPUBLICATION);
if (!empty($work_data)) {
if (!empty($group_id)) {
$extra_conditions = " work.post_group_id = '".intval($group_id)."' ";
// set to select only messages posted by the user's group
@ -2343,11 +2342,13 @@ function get_work_user_list(
$send_to = Portfolio::share('work', $work['id'], array('style' => 'white-space:nowrap;'));
$count = getWorkCommentCount($item_id, $course_info);
$feedback = null;
if (!is_null($count)) {
$feedback = ' <br /><a href="'.$url.'view.php?'.api_get_cidreq().'&id='.$item_id.'" title="'.get_lang('View').'">'.
$count = getWorkCommentCount($item_id, $course_info);
if (!is_null($count) && !empty($count)) {
if ($qualification_exists) {
$feedback .= "<br />";
}
$feedback .= '<a href="'.$url.'view.php?'.api_get_cidreq().'&id='.$item_id.'" title="'.get_lang('View').'">'.
Display::label($count.' '.get_lang('Feedback'), 'info').'</a> ';
}

4
main/work/work.php
Unescape View File

@ -223,9 +223,9 @@ switch ($action) {
'success'
);
Session::write('message', $message);
header('Location: '.$currentUrl);
exit;
}
header('Location: '.$currentUrl);
exit;
}
break;
case 'move':

43
main/work/work_list.php
Unescape View File

@ -124,7 +124,7 @@ if (!empty($work_data['enable_qualification']) && !empty($check_qualification))
get_lang('Actions')
);
$column_model = array (
$column_model = array(
array('name'=>'type', 'index'=>'file', 'width'=>'5', 'align'=>'left', 'search' => 'false', 'sortable' => 'false'),
array('name'=>'title', 'index'=>'title', 'width'=>'40', 'align'=>'left', 'search' => 'false', 'wrap_cell' => 'true'),
array('name'=>'qualification', 'index'=>'qualification', 'width'=>'10', 'align'=>'left', 'search' => 'true'),
@ -135,30 +135,45 @@ if (!empty($work_data['enable_qualification']) && !empty($check_qualification))
} else {
$type = 'complex';
$columns = array(
$columns = array(
get_lang('Type'),
get_lang('Title'),
get_lang('Date'),
get_lang('Actions')
);
$column_model = array (
array('name'=>'type', 'index'=>'file', 'width'=>'5', 'align'=>'left', 'search' => 'false', 'sortable' => 'false'),
array('name'=>'title', 'index'=>'title', 'width'=>'60', 'align'=>'left', 'search' => 'false', 'wrap_cell' => "true"),
array('name'=>'sent_date', 'index'=>'sent_date', 'width'=>'30', 'align'=>'left', 'search' => 'true', 'wrap_cell' => 'true', 'sortable'=>'false'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'20', 'align'=>'left', 'search' => 'false', 'sortable'=>'false')
$column_model = array(
array('name'=>'type', 'index'=>'file', 'width'=>'5', 'align'=>'left', 'search' => 'false', 'sortable' => 'false'),
array('name'=>'title', 'index'=>'title', 'width'=>'60', 'align'=>'left', 'search' => 'false', 'wrap_cell' => "true"),
array('name'=>'sent_date', 'index'=>'sent_date', 'width'=>'30', 'align'=>'left', 'search' => 'true', 'wrap_cell' => 'true', 'sortable'=>'false'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'20', 'align'=>'left', 'search' => 'false', 'sortable'=>'false')
);
}
$extra_params = array();
if (ALLOW_USER_COMMENTS) {
$columns = array(
get_lang('Type'),
get_lang('Title'),
get_lang('Feedback'),
get_lang('Date'),
get_lang('Actions')
);
// Auto width
$extra_params['autowidth'] = 'true';
$column_model = array(
array('name'=>'type', 'index'=>'file', 'width'=>'5', 'align'=>'left', 'search' => 'false', 'sortable' => 'false'),
array('name'=>'title', 'index'=>'title', 'width'=>'60', 'align'=>'left', 'search' => 'false', 'wrap_cell' => "true"),
array('name'=>'qualification', 'index'=>'qualification', 'width'=>'10', 'align'=>'left', 'search' => 'true'),
array('name'=>'sent_date', 'index'=>'sent_date', 'width'=>'30', 'align'=>'left', 'search' => 'true', 'wrap_cell' => 'true', 'sortable'=>'false'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'20', 'align'=>'left', 'search' => 'false', 'sortable'=>'false')
);
}
}
// Height
$extra_params['height'] = 'auto';
$extra_params = array(
'autowidth' => 'true',
'height' => 'auto',
'sortname' => 'firstname'
);
$extra_params['sortname'] = 'firstname';
$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_work_user_list&work_id='.$workId.'&type='.$type;
?>
<script>

187
main/work/work_list_all.php
Unescape View File

@ -35,7 +35,10 @@ if (!api_is_allowed_to_edit()) {
$tool_name = get_lang('StudentPublications');
$group_id = api_get_group_id();
$courseInfo = api_get_course_info();
$courseCode = $courseInfo['code'];
$sessionId = api_get_session_id();
$htmlHeadXtra[] = api_get_jqgrid_js();
$user_id = api_get_user_id();
if (!empty($group_id)) {
$group_properties = GroupManager :: get_group_properties($group_id);
@ -57,12 +60,12 @@ if (!empty($group_id)) {
}
$interbreadcrumb[] = array(
'url' => api_get_path(WEB_CODE_PATH).'group/group.php',
'url' => api_get_path(WEB_CODE_PATH).'group/group.php?'.api_get_cidreq(),
'name' => get_lang('Groups')
);
$interbreadcrumb[] = array(
'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?gidReq='.$group_id,
'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(),
'name' => get_lang('GroupSpace').' '.$group_properties['name']
);
}
@ -78,58 +81,117 @@ $interbreadcrumb[] = array(
$error_message = null;
Display :: display_header(null);
$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : null;
$item_id = isset($_REQUEST['item_id']) ? intval($_REQUEST['item_id']) : null;
$itemId = isset($_REQUEST['item_id']) ? intval($_REQUEST['item_id']) : null;
$message = null;
switch ($action) {
case 'delete':
/* Delete document */
if ($itemId) {
$fileDeleted = deleteWorkItem($itemId, $courseInfo);
if (!$fileDeleted) {
$message = Display::return_message(get_lang('YouAreNotAllowedToDeleteThisDocument'), 'error');
} else {
$message = Display::return_message(get_lang('TheDocumentHasBeenDeleted'), 'confirmation');
}
}
break;
case 'make_visible':
/* Visible */
if ($is_allowed_to_edit) {
if (!empty($itemId)) {
if (isset($itemId) && $itemId == 'all') {
} else {
makeVisible($itemId, $courseInfo);
$message = Display::return_message(get_lang('FileVisible'), 'confirmation');
}
}
}
break;
case 'make_invisible':
/* Invisible */
if (!empty($itemId)) {
if (isset($itemId) && $itemId == 'all') {
} else {
makeInvisible($itemId, $courseInfo);
$message = Display::return_message(get_lang('FileInvisible'), 'confirmation');
}
}
break;
case 'export_pdf':
$pdf = new PDF();
/* Delete document */
if ($action == 'delete' && $item_id) {
$file_deleted = deleteWorkItem($item_id, $_course);
if (!$file_deleted) {
Display::display_error_message(get_lang('YouAreNotAllowedToDeleteThisDocument'));
} else {
Display::display_confirmation_message(get_lang('TheDocumentHasBeenDeleted'));
}
}
$header = get_lang('Course').': '.$courseInfo['title'];
$teachers = CourseManager::get_teacher_list_from_course_code_to_string(
$courseCode
);
/* Visible */
if ($is_allowed_to_edit && $action == 'make_visible') {
if (!empty($item_id)) {
if (isset($item_id) && $item_id == 'all') {
} else {
makeVisible($item_id, $courseInfo);
Display::display_confirmation_message(get_lang('FileVisible'));
if (!empty($sessionId)) {
$sessionInfo = api_get_session_info($sessionId);
$header .= ' - '.$sessionInfo['name'];
$header .= '<br />'.$sessionInfo['description'];
$teachers = SessionManager::getCoachesByCourseSessionToString(
$sessionId,
$courseCode
);
}
}
}
if ($is_allowed_to_edit && $action == 'make_invisible') {
$header .= '<br />'.get_lang('Teachers').': '.$teachers;
$header .= '<br />'.get_lang('Date').': '.api_get_local_time();
/* Invisible */
if (!empty($item_id)) {
if (isset($item_id) && $item_id == 'all') {
} else {
makeInvisible($item_id, $courseInfo);
Display::display_confirmation_message(get_lang('FileInvisible'));
if (!empty($my_folder_data['expires_on'])) {
$header .= '<br />' . get_lang('ExpiryDate') . ': ' . api_get_local_time($my_folder_data['expires_on']);
}
}
if (ADD_DOCUMENT_TO_WORK) {
$documents = getAllDocumentToWork(
$my_folder_data['id'],
$courseInfo['real_id']
);
foreach ($documents as $document) {
$document['document_id'];
}
VAR_DUMP($documents);
$studentWorks = getAllUserToWork(
$my_folder_data['id'],
$courseInfo['real_id']
);
VAR_DUMP($studentWorks);
}
VAR_DUMP($my_folder_data);exit;
$pdf->content_to_pdf($header, null, $my_folder_data['title'], $courseCode);
exit;
break;
}
Display :: display_header(null);
echo $message;
$documentsAddedInWork = getAllDocumentsFromWorkToString($workId, $courseInfo);
echo '<div class="actions">';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'">'.
Display::return_icon('back.png', get_lang('BackToWorksList'),'',ICON_SIZE_MEDIUM).'</a>';
Display::return_icon('back.png', get_lang('BackToWorksList'), '', ICON_SIZE_MEDIUM).'</a>';
if (api_is_allowed_to_session_edit(false, true) && !empty($workId)) {
/*echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/upload.php?'.api_get_cidreq().'&id='.$workId.'">';
echo Display::return_icon('upload_file.png', get_lang('UploadADocument'), '', ICON_SIZE_MEDIUM).'</a>';*/
if (ADD_DOCUMENT_TO_WORK) {
echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/add_document.php?'.api_get_cidreq().'&id='.$workId.'">';
echo Display::return_icon('new_document.png', get_lang('AddDocument'), '', ICON_SIZE_MEDIUM).'</a>';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/add_user.php?'.api_get_cidreq().'&id='.$workId.'">';
echo Display::return_icon('user.png', get_lang('AddUsers'), '', ICON_SIZE_MEDIUM).'</a>';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/work_list_all.php?'.api_get_cidreq().'&id='.$workId.'&action=export_pdf">';
echo Display::return_icon('pdf.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>';
}
$display_output = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work_missing.php?'.api_get_cidreq().'&amp;id='.$workId.'&amp;list=without">'.
@ -141,7 +203,6 @@ if (api_is_allowed_to_session_edit(false, true) && !empty($workId)) {
}
echo $display_output;
echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/edit_work.php?'.api_get_cidreq().'&id='.$workId.'">';
echo Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_MEDIUM).'</a>';
}
@ -174,12 +235,25 @@ if (!empty($work_data['enable_qualification']) &&
get_lang('FirstName'),
get_lang('LastName'),
get_lang('Title'),
get_lang('Feedback'),
get_lang('Score'),
get_lang('Date'),
get_lang('Status'),
get_lang('Actions')
);
if (ALLOW_USER_COMMENTS) {
$columns = array(
get_lang('Type'),
get_lang('FirstName'),
get_lang('LastName'),
get_lang('Title'),
get_lang('Feedback'),
get_lang('Date'),
get_lang('Status'),
get_lang('Actions')
);
}
$column_model = array(
array('name'=>'type', 'index'=>'file', 'width'=>'8', 'align'=>'left', 'search' => 'false', 'sortable' => 'false'),
array('name'=>'firstname', 'index'=>'firstname', 'width'=>'35', 'align'=>'left', 'search' => 'true'),
@ -203,23 +277,42 @@ if (!empty($work_data['enable_qualification']) &&
);
$column_model = array(
array('name'=>'type', 'index'=>'file', 'width'=>'8', 'align'=>'left', 'search' => 'false', 'sortable' => 'false'),
array('name'=>'firstname', 'index'=>'firstname', 'width'=>'35', 'align'=>'left', 'search' => 'true'),
array('name'=>'lastname', 'index'=>'lastname', 'width'=>'35', 'align'=>'left', 'search' => 'true'),
array('name'=>'title', 'index'=>'title', 'width'=>'40', 'align'=>'left', 'search' => 'false', 'wrap_cell' => "true"),
array('name'=>'sent_date', 'index'=>'sent_date', 'width'=>'45', 'align'=>'left', 'search' => 'true', 'wrap_cell' => 'true'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'40', 'align'=>'left', 'search' => 'false', 'sortable'=>'false', 'wrap_cell' => 'true')
array('name'=>'type', 'index'=>'file', 'width'=>'8', 'align'=>'left', 'search' => 'false', 'sortable' => 'false'),
array('name'=>'firstname', 'index'=>'firstname', 'width'=>'35', 'align'=>'left', 'search' => 'true'),
array('name'=>'lastname', 'index'=>'lastname', 'width'=>'35', 'align'=>'left', 'search' => 'true'),
array('name'=>'title', 'index'=>'title', 'width'=>'40', 'align'=>'left', 'search' => 'false', 'wrap_cell' => "true"),
array('name'=>'sent_date', 'index'=>'sent_date', 'width'=>'45', 'align'=>'left', 'search' => 'true', 'wrap_cell' => 'true'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'40', 'align'=>'left', 'search' => 'false', 'sortable'=>'false', 'wrap_cell' => 'true')
);
}
$extra_params = array();
if (ALLOW_USER_COMMENTS) {
$columns = array(
get_lang('Type'),
get_lang('FirstName'),
get_lang('LastName'),
get_lang('Title'),
get_lang('Feedback'),
get_lang('Date'),
get_lang('Actions')
);
// Auto-width
$extra_params['autowidth'] = 'true';
$column_model = array(
array('name'=>'type', 'index'=>'file', 'width'=>'8', 'align'=>'left', 'search' => 'false', 'sortable' => 'false'),
array('name'=>'firstname', 'index'=>'firstname', 'width'=>'35', 'align'=>'left', 'search' => 'true'),
array('name'=>'lastname', 'index'=>'lastname', 'width'=>'35', 'align'=>'left', 'search' => 'true'),
array('name'=>'title', 'index'=>'title', 'width'=>'40', 'align'=>'left', 'search' => 'false', 'wrap_cell' => "true"),
array('name'=>'qualification', 'index'=>'qualification', 'width'=>'25', 'align'=>'left', 'search' => 'true'),
array('name'=>'sent_date', 'index'=>'sent_date', 'width'=>'45', 'align'=>'left', 'search' => 'true', 'wrap_cell' => 'true'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'40', 'align'=>'left', 'search' => 'false', 'sortable'=>'false', 'wrap_cell' => 'true')
);
}
}
// height auto
$extra_params['height'] = 'auto';
$extra_params['sortname'] = 'firstname';
$extra_params = array(
'autowidth' => 'true',
'height' => 'auto',
'sortname' => 'firstname'
);
$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_work_user_list_all&work_id='.$workId.'&type='.$type;
?>

Write Preview
Loading…
Cancel
Save