Adding jqgrid to the work list, replacing <form> HTML tags with FormValidator, adding multiple delete work.

1.9.x
Julio Montoya 12 years ago
parent 890071bde1
commit 7792920c22
  1. 44
      main/inc/ajax/model.ajax.php
  2. 16
      main/inc/ajax/work.ajax.php
  3. 32
      main/work/add_user.php
  4. 6
      main/work/edit.php
  5. 125
      main/work/edit_work.php
  6. 1568
      main/work/work.lib.php
  7. 504
      main/work/work.php
  8. 36
      main/work/work_list.php
  9. 2
      main/work/work_list_others.php
  10. 13
      tests/main/work/work.lib.test.php

@ -36,6 +36,8 @@ if (!in_array(
array(
'get_exercise_results',
'get_hotpotatoes_exercise_results',
'get_work_teacher',
'get_work_student',
'get_work_user_list',
'get_work_user_list_others',
'get_work_user_list_all',
@ -47,7 +49,7 @@ if (!in_array(
api_protect_admin_script(true);
}
//Search features
// Search features
$ops = array (
'eq' => '=', //equal
@ -137,6 +139,15 @@ switch ($action) {
case 'get_user_skill_ranking':
$skill = new Skill();
$count = $skill->get_user_list_skill_ranking_count();
break;
case 'get_work_teacher':
require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php';
$count = getWorkListTeacher($start, $limit, $sidx, $sord, $where_condition, true);
break;
case 'get_work_student':
require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php';
$count = getWorkListStudent($start, $limit, $sidx, $sord, $where_condition, true);
break;
case 'get_work_user_list_all':
require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php';
@ -295,17 +306,16 @@ switch ($action) {
break;
case 'get_user_skill_ranking':
$columns = array('photo', 'firstname', 'lastname', 'skills_acquired', 'currently_learning', 'rank');
$result = $skill->get_user_list_skill_ranking($start, $limit, $sidx, $sord, $where_condition);
$result = $skill->get_user_list_skill_ranking($start, $limit, $sidx, $sord, $where_condition);
$result = msort($result, 'skills_acquired', 'asc');
$skills_in_course = array();
if (!empty($result)) {
//$counter = 1;
foreach ($result as &$item) {
if (!empty($result)) {
foreach ($result as &$item) {
$user_info = api_get_user_info($item['user_id']);
$personal_course_list = UserManager::get_personal_session_course_list($item['user_id']);
$count_skill_by_course = array();
foreach ($personal_course_list as $course_item) {
foreach ($personal_course_list as $course_item) {
if (!isset($skills_in_course[$course_item['code']])) {
$count_skill_by_course[$course_item['code']] = $skill->get_count_skills_by_course($course_item['code']);
$skills_in_course[$course_item['code']] = $count_skill_by_course[$course_item['code']];
@ -313,17 +323,23 @@ switch ($action) {
$count_skill_by_course[$course_item['code']] = $skills_in_course[$course_item['code']];
}
}
$item['photo'] = Display::img($user_info['avatar_small']);
$item['currently_learning'] = !empty($count_skill_by_course) ? array_sum($count_skill_by_course) : 0;
}
}
break;
$item['photo'] = Display::img($user_info['avatar_small']);
$item['currently_learning'] = !empty($count_skill_by_course) ? array_sum($count_skill_by_course) : 0;
}
}
break;
case 'get_work_teacher':
$columns = array('type', 'title', 'expires_on', 'ends_on', 'actions');
$result = getWorkListTeacher($start, $limit, $sidx, $sord, $where_condition);
break;
case 'get_work_student':
$columns = array('type', 'title', 'expires_on', 'others', 'actions');
$result = getWorkListStudent($start, $limit, $sidx, $sord, $where_condition);
break;
case 'get_work_user_list_all':
if (isset($_GET['type']) && $_GET['type'] == 'simple') {
//$columns = array('type', 'firstname', 'lastname', 'username', 'title', 'qualification', 'sent_date', 'qualificator_id', 'actions');
$columns = array('type', 'firstname', 'lastname', 'title', 'qualification', 'sent_date', 'qualificator_id', 'actions');
} else {
//$columns = array('type', 'firstname', 'lastname', 'username', 'title', 'sent_date', 'actions');
$columns = array('type', 'firstname', 'lastname', 'title', 'sent_date', 'actions');
}
$result = get_work_user_list($start, $limit, $sidx, $sord, $work_id, $where_condition);
@ -566,6 +582,8 @@ $allowed_actions = array(
'get_sessions',
'get_exercise_results',
'get_hotpotatoes_exercise_results',
'get_work_teacher',
'get_work_student',
'get_work_user_list',
'get_work_user_list_others',
'get_work_user_list_all',

@ -8,15 +8,21 @@ require_once '../global.inc.php';
require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php';
$action = isset($_REQUEST['a']) ? $_REQUEST['a'] : null;
switch ($action) {
case 'get_work_user_list':
$is_allowed_to_edit = api_is_allowed_to_edit();
break;
switch ($action) {
case 'delete_work':
if ($is_allowed_to_edit) {
$workList = explode(',', $_REQUEST['id']);
foreach ($workList as $workId) {
deleteDirWork($workId);
}
}
break;
default:
echo '';
break;
}
exit;

@ -1,11 +1,10 @@
<?php
/* For licensing terms, see /license.txt */
use ChamiloSession as Session;
$language_file = array('exercice', 'work', 'document', 'admin', 'gradebook');
require_once '../inc/global.inc.php';
// Including necessary files
require_once 'work.lib.php';
@ -38,7 +37,7 @@ $courseInfo = api_get_course_info();
$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq(), 'name' => get_lang('StudentPublications'));
$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'work/work_list_all.php?'.api_get_cidreq().'&id='.$workId, 'name' => $my_folder_data['title']);
$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('AddUser'));
$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('AddUsers'));
$error_message = null;
@ -74,28 +73,33 @@ if (!empty($items)) {
$usersAdded[] = $myUserId;
$userInfo = api_get_user_info($myUserId);
$url = api_get_path(WEB_CODE_PATH).'work/add_user.php?action=delete&id='.$workId.'&user_id='.$myUserId;
$link = Display::url(get_lang('Delete'), $url);
echo $userInfo['complete_name'].' '.$link.'<br />';
$link = Display::url(get_lang('Delete'), $url, array('class' => 'btn btn-danger'));
echo $userInfo['complete_name_with_username'].' '.$link.'<br />';
}
echo '</div>';
}
$userList = CourseManager::get_user_list_from_course_code($courseInfo['code'], api_get_session_id(), null, null, STUDENT);
echo Display::page_subheader(get_lang('UserToAdd'));
if (!empty($userList)) {
$userToAddList = array();
foreach ($userList as $user) {
if (!in_array($user['user_id'], $usersAdded)) {
$userToAddList[] = $user;
}
}
if (!empty($userToAddList)) {
echo Display::page_subheader(get_lang('UsersToAdd'));
echo '<div class="well">';
foreach ($userList as $user) {
if (in_array($user['user_id'], $usersAdded)) {
continue;
}
$userName = api_get_person_name($user['firstname'], $user['lastname']);
foreach ($userToAddList as $user) {
$userName = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].') ';
$url = api_get_path(WEB_CODE_PATH).'work/add_user.php?action=add&id='.$workId.'&user_id='.$user['user_id'];
$link = Display::url(get_lang('Add'), $url);
$link = Display::url(get_lang('Add'), $url, array('class' => 'btn btn-primary'));
echo $userName.' '.$link.'<br />';
}
echo '</div>';
} else {
Display::display_warning_message(get_lang('NoUsersToAdd'));
}
echo '<hr /><div class="clear"></div>';

@ -1,8 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
use ChamiloSession as Session;
$language_file = array('exercice', 'work', 'document', 'admin', 'gradebook');
require_once '../inc/global.inc.php';
@ -52,9 +50,7 @@ $token = Security::get_token();
$student_can_edit_in_session = api_is_allowed_to_session_edit(false, true);
$has_ended = false;
$is_author = false;
$work_item = get_work_data_by_id($item_id);
// Get the author ID for that document from the item_property table
@ -142,7 +138,7 @@ $defaults["description"] = $work_item['description'];
$defaults['qualification'] = $work_item['qualification'];
if ($is_allowed_to_edit && !empty($item_id)) {
// Get qualification from parent_id that'll allow the validation qualification over
// Get qualification from parent_id that will allow the validation qualification over
$sql = "SELECT qualification FROM $work_table WHERE c_id = $course_id AND id ='$work_id' ";
$result = Database::query($sql);
$row = Database::fetch_array($result);

@ -0,0 +1,125 @@
<?php
/* For licensing terms, see /license.txt */
$language_file = array('exercice', 'work', 'document', 'admin', 'gradebook');
require_once '../inc/global.inc.php';
require_once 'work.lib.php';
// Section (for the tabs)
$this_section = SECTION_COURSES;
if (!api_is_allowed_to_edit()) {
api_not_allowed(true);
}
$courseInfo = api_get_course_info();
$workId = isset($_GET['id']) ? intval($_GET['id']) : null;
$workData = get_work_data_by_id($workId);
$homework = get_work_assignment_by_id($workId);
$locked = api_resource_is_locked_by_gradebook($workId, LINK_STUDENTPUBLICATION);
if (api_is_platform_admin() == false && $locked == true) {
api_not_allowed(true);
}
$htmlHeadXtra[] = to_javascript_work();
$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq(), 'name' => get_lang('StudentPublications'));
$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Edit'));
Display::display_header();
$form = new FormValidator('edit_dir', 'post', api_get_path(WEB_CODE_PATH).'work/edit_work.php?id='.$workId.'&'. api_get_cidreq());
$form->addElement('header', get_lang('Edit'));
$title = !empty($workData['title']) ? $workData['title'] : basename($workData['url']);
$defaults = $workData;
$defaults['new_dir'] = Security::remove_XSS($title);
$there_is_a_end_date = false;
if (Gradebook::is_active()) {
$link_info = is_resource_in_course_gradebook(api_get_course_id(), LINK_STUDENTPUBLICATION, $workId);
if (!empty($link_info)) {
$defaults['weight'] = $link_info['weight'];
$defaults['category_id'] = $link_info['category_id'];
$defaults['make_calification'] = 1;
}
} else {
$defaults['category_id'] = '';
}
if ($homework['expires_on'] != '0000-00-00 00:00:00') {
$homework['expires_on'] = api_get_local_time($homework['expires_on']);
$there_is_a_expire_date = true;
$defaults['enableExpiryDate'] = true;
} else {
$homework['expires_on'] = api_get_local_time();
$expires_date_array = convert_date_to_array(api_get_local_time(), 'expires');
$defaults = array_merge($defaults, $expires_date_array);
$there_is_a_expire_date = false;
}
if ($homework['ends_on'] != '0000-00-00 00:00:00') {
$homework['ends_on'] = api_get_local_time($homework['ends_on']);
$there_is_a_end_date = true;
$defaults['enableEndDate'] = true;
} else {
$homework['ends_on'] = api_get_local_time();
$expires_date_array = convert_date_to_array(api_get_local_time(), 'ends');
$defaults = array_merge($defaults, $expires_date_array);
$there_is_a_end_date = false;
}
if ($there_is_a_end_date) {
$end_date_array = convert_date_to_array($homework['ends_on'], 'ends');
$defaults = array_merge($defaults, $end_date_array);
}
if ($there_is_a_expire_date) {
$expires_date_array = convert_date_to_array($homework['expires_on'], 'expires');
$defaults = array_merge($defaults, $expires_date_array);
}
$defaults['add_to_calendar'] = isset($homework['add_to_calendar']) ? $homework['add_to_calendar'] : null;
$form = getFormWork($form, $defaults);
$form->addElement('hidden', 'work_id', $workId);
$form->addElement('style_submit_button', 'submit', get_lang('ModifyDirectory'), 'class="save"');
$display_edit_form = true;
if ($form->validate()) {
$params = $form->exportValues();
$workId = $params['work_id'];
$dir_name = replace_dangerous_char($params['dir_name']);
$dir_name = disable_dangerous_file($dir_name);
$edit_check = false;
$workData = get_work_data_by_id($workId);
if (!empty($workData)) {
$edit_check = true;
} else {
$edit_check = true;
}
if ($edit_check) {
updatePublicationAssignment($workId, $params, $courseInfo, $group_id);
updateDirName($workData, $dir_name, $params['dir_name'], $courseInfo);
$dir = $dir_name;
Display::display_confirmation_message(get_lang('FolderEdited'));
} else {
Display::display_warning_message(get_lang('FileExists'));
}
}
$form->display();
Display :: display_footer();

File diff suppressed because it is too large Load Diff

@ -1,45 +1,8 @@
<?php
/* For licensing terms, see /license.txt */
use ChamiloSession as Session;
/**
* @package chamilo.work
* @author Thomas, Hugues, Christophe - original version
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University - ability for course admins to specify wether uploaded documents are visible or invisible by default.
* @author Roan Embrechts, code refactoring and virtual course support
* @author Frederic Vauthier, directories management
* @author Julio Montoya <gugli100@gmail.com> BeezNest 2011 LOTS of bug fixes
*
* @todo refactor more code into functions, use quickforms, coding standards, ... jm
*/
/**
* STUDENT PUBLICATIONS MODULE
*
* Note: for a more advanced module, see the dropbox tool.
* This one is easier with less options.
* This tool is better used for publishing things,
* sending in assignments is better in the dropbox.
*
* GOALS
* *****
* Allow student to quickly send documents immediately visible on the Course
*
* The script does 5 things:
*
* 1. Upload documents
* 2. Give them a name
* 3. Modify data about documents
* 4. Delete link to documents and simultaneously remove them
* 5. Show documents list to students and visitors
*
* On the long run, the idea is to allow sending realvideo . Which means only
* establish a correspondence between RealServer Content Path and the user's
* documents path.
*
*
*/
**/
/* INIT SECTION */
@ -48,11 +11,8 @@ $language_file = array('exercice', 'work', 'document', 'admin', 'gradebook');
require_once '../inc/global.inc.php';
$current_course_tool = TOOL_STUDENTPUBLICATION;
/* Configuration settings */
api_protect_course_script(true);
// Including necessary files
require_once 'work.lib.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
@ -74,7 +34,7 @@ $curdirpath = '';
$htmlHeadXtra[] = api_get_jqgrid_js();
$htmlHeadXtra[] = to_javascript_work();
$htmlHeadXtra[] = '<script>
function setFocus(){
function setFocus() {
$("#work_title").focus();
}
$(document).ready(function () {
@ -82,29 +42,14 @@ $(document).ready(function () {
});
</script>';
// Table definitions
$main_course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
$work_table = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
$TSTDPUBASG = Database :: get_course_table(TABLE_STUDENT_PUBLICATION_ASSIGNMENT);
$table_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$table_user = Database :: get_main_table(TABLE_MAIN_USER);
$table_session = Database :: get_main_table(TABLE_MAIN_SESSION);
$table_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$_course = api_get_course_info();
/* Constants and variables */
$tool_name = get_lang('StudentPublications');
$course_code = api_get_course_id();
$session_id = api_get_session_id();
$currentCourseRepositorySys = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/';
$currentCourseRepositoryWeb = api_get_path(WEB_COURSE_PATH) . $_course['path'] . '/';
$currentUserFirstName = $_user['firstName'];
$currentUserLastName = $_user['lastName'];
$currentUserEmail = $_user['mail'];
$tool_name = get_lang('StudentPublications');
$course_code = api_get_course_id();
$session_id = api_get_session_id();
$group_id = api_get_group_id();
$item_id = isset($_REQUEST['item_id']) ? intval($_REQUEST['item_id']) : null;
$parent_id = isset($_REQUEST['parent_id']) ? Database::escape_string($_REQUEST['parent_id']) : '';
@ -114,9 +59,7 @@ $title = isset($_REQUEST['title']) ? $_REQUEST['title'] : '';
$description = isset($_REQUEST['description']) ? $_REQUEST['description'] : '';
$uploadvisibledisabled = isset($_REQUEST['uploadvisibledisabled']) ? Database::escape_string($_REQUEST['uploadvisibledisabled']) : $course_info['show_score'];
//directories management
$sys_course_path = api_get_path(SYS_COURSE_PATH);
$course_dir = $sys_course_path . $_course['path'];
$course_dir = api_get_path(SYS_COURSE_PATH).$_course['path'];
$base_work_dir = $course_dir . '/work';
$link_target_parameter = ""; // e.g. "target=\"_blank\"";
@ -130,35 +73,12 @@ if ($action == 'downloadfolder') {
require 'downloadfolder.inc.php';
}
/* More init stuff */
if (isset ($_POST['cancelForm']) && !empty ($_POST['cancelForm'])) {
header('Location: '.api_get_self().'?origin='.$origin.'&amp;gradebook='.$gradebook);
exit;
}
// If the POST's size exceeds 8M (default value in php.ini) the $_POST array is emptied
// If that case happens, we set $submitWork to 1 to allow displaying of the error message
// The redirection with header() is needed to avoid apache to show an error page on the next request
if ($_SERVER['REQUEST_METHOD'] == 'POST' && !sizeof($_POST)) {
if (strstr($_SERVER['REQUEST_URI'], '?')) {
header('Location: ' . $_SERVER['REQUEST_URI'] . '&submitWork=1');
exit();
} else {
header('Location: ' . $_SERVER['REQUEST_URI'] . '?submitWork=1');
exit();
}
}
$group_id = api_get_group_id();
$display_upload_form = false;
if ($action == 'upload_form') {
$display_upload_form = true;
}
/* Header */
if (!empty($_GET['gradebook']) && $_GET['gradebook'] == 'view') {
$_SESSION['gradebook'] = Security::remove_XSS($_GET['gradebook']);
$gradebook = $_SESSION['gradebook'];
@ -188,12 +108,9 @@ if (!empty($group_id)) {
$interbreadcrumb[] = array ('url' => '../group/group.php', 'name' => get_lang('Groups'));
$interbreadcrumb[] = array ('url' => '../group/group_space.php?gidReq='.$group_id, 'name' => get_lang('GroupSpace').' '.$group_properties['name']);
$url_dir ='';
$interbreadcrumb[] = array ('url' =>'work.php?gidReq='.$group_id,'name' => get_lang('StudentPublications'));
$url_dir = 'work.php?&id=' . $work_id;
$interbreadcrumb[] = array ('url' => $url_dir,'name' => $my_folder_data['title']);
$interbreadcrumb[] = array ('url' => $url_dir, 'name' => $my_folder_data['title']);
if ($action == 'upload_form') {
$interbreadcrumb[] = array ('url' => 'work.php','name' => get_lang('UploadADocument'));
@ -202,7 +119,7 @@ if (!empty($group_id)) {
if ($action == 'create_dir') {
$interbreadcrumb[] = array ('url' => 'work.php','name' => get_lang('CreateAssignment'));
}
Display :: display_header(null);
Display::display_header(null);
} else {
if (isset($origin) && $origin != 'learnpath') {
@ -211,7 +128,6 @@ if (!empty($group_id)) {
} else {
$interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('StudentPublications'));
}
$url_dir = 'work.php?id=' . $work_id;
$interbreadcrumb[] = array ('url' => $url_dir,'name' => $my_folder_data['title']);
@ -225,76 +141,46 @@ if (!empty($group_id)) {
$interbreadcrumb[] = array ('url' => '#','name' => get_lang('CreateAssignment'));
}
Display :: display_header(null);
} else {
//we are in the learnpath tool
Display::display_reduced_header();
}
}
//stats
// Stats
event_access_tool(TOOL_STUDENTPUBLICATION);
$is_allowed_to_edit = api_is_allowed_to_edit();
$student_can_edit_in_session = api_is_allowed_to_session_edit(false, true);
Display::display_introduction_section(TOOL_STUDENTPUBLICATION);
// introduction section
if ($origin == 'learnpath') {
echo '<div style="height:15px">&nbsp;</div>';
}
/* Display links to upload form and tool options */
if (!in_array($action, array('add', 'create_dir'))) {
$token = Security::get_token();
}
$courseInfo = api_get_course_info();
display_action_links($work_id, $curdirpath, $action);
// for teachers
// For teachers
switch ($action) {
case 'settings':
//if posts
if ($is_allowed_to_edit && !empty($_POST['changeProperties'])) {
// Changing the tool setting: default visibility of an uploaded document
// @todo
$query = "UPDATE ".$main_course_table." SET show_score='" . $uploadvisibledisabled . "' WHERE code='" . api_get_course_id() . "'";
$res = Database::query($query);
/**
* Course data are cached in session so we need to update both the database
* and the session data
*/
$_course['show_score'] = $uploadvisibledisabled;
Session::write('_course', $course);
// changing the tool setting: is a student allowed to delete his/her own document
// database table definition
$table_course_setting = Database :: get_course_table(TOOL_COURSE_SETTING);
// counting the number of occurrences of this setting (if 0 => add, if 1 => update)
$query = "SELECT * FROM " . $table_course_setting . " WHERE c_id = $course_id AND variable = 'student_delete_own_publication'";
$result = Database::query($query);
$number_of_setting = Database::num_rows($result);
if ($number_of_setting == 1) {
$query = "UPDATE " . $table_course_setting . " SET value='" . Database::escape_string($_POST['student_delete_own_publication']) . "'
WHERE variable='student_delete_own_publication' AND c_id = $course_id";
Database::query($query);
} else {
$query = "INSERT INTO " . $table_course_setting . " (c_id, variable, value, category) VALUES
($course_id, 'student_delete_own_publication','" . Database::escape_string($_POST['student_delete_own_publication']) . "','work')";
Database::query($query);
}
updateSettings($course, $_POST['show_score'], $_POST['student_delete_own_publication']);
Display::display_confirmation_message(get_lang('Saved'));
}
$studentDeleteOwnPublication = api_get_course_setting('student_delete_own_publication') == 1 ? 1 : 0;
/* Display of tool options */
display_tool_options($uploadvisibledisabled, $origin);
settingsForm(
array(
'show_score' => $course_info['show_score'],
'student_delete_own_publication' => $studentDeleteOwnPublication
)
);
break;
case 'mark_work':
if (!api_is_allowed_to_edit()) {
@ -304,180 +190,21 @@ switch ($action) {
break;
case 'create_dir':
case 'add':
//$check = Security::check_token('post');
//show them the form for the directory name
// Show them the form for the directory name
if ($is_allowed_to_edit && in_array($action, array('create_dir', 'add'))) {
if ($is_allowed_to_edit && in_array($action, array('create_dir','add'))) {
//create the form that asks for the directory name
$form = new FormValidator('form1', 'post', api_get_self().'?action=create_dir&'. api_get_cidreq());
$form->addElement('header', get_lang('CreateAssignment').$token);
$form = new FormValidator('form1', 'post', api_get_path(WEB_CODE_PATH).'work/work.php?action=create_dir&'. api_get_cidreq());
$form->addElement('header', get_lang('CreateAssignment'));
$form->addElement('hidden', 'action', 'add');
$form->addElement('hidden', 'curdirpath', Security :: remove_XSS($curdirpath));
$form->addElement('text', 'new_dir', get_lang('AssignmentName'));
$form->addRule('new_dir', get_lang('ThisFieldIsRequired'), 'required');
$form->add_html_editor('description', get_lang('Description'), false, false, getWorkDescriptionToolbar());
$form->addElement('advanced_settings', '<a href="javascript: void(0);" onclick="javascript: return plus();">
<span id="plus">'.Display::return_icon('div_show.gif',get_lang('AdvancedParameters'), array('style' => 'vertical-align:center')).' '.get_lang('AdvancedParameters').'</span></a>');
$form->addElement('html', '<div id="options" style="display: none;">');
// QualificationOfAssignment
$form->addElement('text', 'qualification_value', get_lang('QualificationNumeric'));
if ((api_get_session_id() != 0 && Gradebook::is_active()) || api_get_session_id() == 0) {
$form->addElement('checkbox', 'make_calification', null, get_lang('MakeQualifiable'), array('id' =>'make_calification_id', 'onclick' => "javascript: if(this.checked){document.getElementById('option1').style.display='block';}else{document.getElementById('option1').style.display='none';}"));
} else {
// QualificationOfAssignment
$form->addElement('hidden', 'make_calification', false);
}
$form->addElement('html', '<div id="option1" style="display: none;">');
//Loading gradebook select
load_gradebook_select_in_tool($form);
$form->addElement('text', 'weight', get_lang('WeightInTheGradebook'));
$form->addElement('html', '</div>');
$form->addElement('checkbox', 'type1', null, get_lang('EnableExpiryDate'), array('id' =>'make_calification_id', 'onclick' => "javascript: if(this.checked){document.getElementById('option2').style.display='block';}else{document.getElementById('option2').style.display='none';}"));
$form->addElement('html', '<div id="option2" style="display: none;">');
$form->addElement('advanced_settings', draw_date_picker('expires'));
$form->addElement('html', '</div>');
$form->addElement('checkbox', 'type2', null, get_lang('EnableEndDate'), array('id' =>'make_calification_id', 'onclick' => "javascript: if(this.checked){document.getElementById('option3').style.display='block';}else{document.getElementById('option3').style.display='none';}"));
$form->addElement('html', '<div id="option3" style="display: none;">');
$form->addElement('advanced_settings', draw_date_picker('ends'));
$form->addElement('html', '</div>');
$form->addElement('checkbox', 'add_to_calendar', null, get_lang('AddToCalendar'));
$form->addElement('checkbox', 'allow_text_assignment', null, get_lang('AllowTextAssignments'));
$form->addElement('html', '</div>');
$form = getFormWork($form, array());
$form->addElement('style_submit_button', 'submit', get_lang('CreateDirectory'));
if ($form->validate()) {
$directory = Security::remove_XSS($_POST['new_dir']);
$directory = replace_dangerous_char($directory);
$directory = disable_dangerous_file($directory);
$dir_name = $curdirpath.$directory;
$created_dir = create_unexisting_work_directory($base_work_dir, $dir_name);
// we insert here the directory in the table $work_table
$dir_name_sql = '';
if (!empty($created_dir)) {
if ($curdirpath == '/') {
$dir_name_sql = $created_dir;
} else {
$dir_name_sql = '/'.$created_dir;
}
$time = time();
$today = api_get_utc_datetime($time);
$sql_add_publication = "INSERT INTO " . $work_table . " SET
c_id = $course_id,
url = '".Database::escape_string($dir_name_sql)."',
title = '".Database::escape_string($_POST['new_dir'])."',
description = '".Database::escape_string($_POST['description'])."',
author = '',
active = '1',
accepted = '1',
filetype = 'folder',
post_group_id = '".$group_id."',
sent_date = '".$today."',
qualification = '".(($_POST['qualification_value']!='') ? Database::escape_string($_POST['qualification_value']) : '') ."',
parent_id = '',
qualificator_id = '',
date_of_qualification = '0000-00-00 00:00:00',
weight = '".Database::escape_string($_POST['weight'])."',
session_id = '".intval($id_session)."',
allow_text_assignment = '".Database::escape_string($_POST['allow_text_assignment'])."',
contains_file = 0,
user_id = '".$user_id."'";
Database::query($sql_add_publication);
// add the directory
$id = Database::insert_id();
if ($id) {
// Insert into agenda
$agenda_id = 0;
$end_date = '';
if (isset($_POST['add_to_calendar']) && $_POST['add_to_calendar'] == 1) {
require_once api_get_path(SYS_CODE_PATH).'calendar/agenda.inc.php';
require_once api_get_path(SYS_CODE_PATH).'resourcelinker/resourcelinker.inc.php';
// Setting today date
$date = $end_date = $time;
$title = sprintf(get_lang('HandingOverOfTaskX'), $_POST['new_dir']);
if (!empty($_POST['type1'])) {
$end_date = get_date_from_select('expires');
$date = $end_date;
}
$description = isset($_POST['description']) ? $_POST['description'] : '';
$content = '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.api_substr($dir_name_sql, 1).'" >'.$_POST['new_dir'].'</a>'.$description;
$agenda_id = agenda_add_item($course_info, $title, $content, $date, $end_date, array('GROUP:'.$group_id), 0);
}
}
//Folder created
api_item_property_update($course_info, 'work', $id, 'DirectoryCreated', $user_id, $group_id);
Display :: display_confirmation_message(get_lang('DirectoryCreated'), false);
// insert into student_publication_assignment
//return something like this: 2008-02-45 00:00:00
$enable_calification = isset($_POST['qualification_value']) && !empty($_POST['qualification_value']) ? 1 : 0;
if (!empty($_POST['type1']) || !empty($_POST['type2'])) {
$sql_add_homework = "INSERT INTO $TSTDPUBASG SET
c_id = $course_id ,
expires_on = '".((isset($_POST['type1']) && $_POST['type1']==1) ? api_get_utc_datetime(get_date_from_select('expires')) : '0000-00-00 00:00:00'). "',
ends_on = '".((isset($_POST['type2']) && $_POST['type2']==1) ? api_get_utc_datetime(get_date_from_select('ends')) : '0000-00-00 00:00:00')."',
add_to_calendar = '$agenda_id',
enable_qualification = '$enable_calification',
publication_id = '$id'";
Database::query($sql_add_homework);
$my_last_id = Database::insert_id();
$sql_add_publication = "UPDATE $work_table SET has_properties = $my_last_id , view_properties = 1 WHERE c_id = $course_id AND id = $id";
Database::query($sql_add_publication);
} else {
$sql_add_homework = "INSERT INTO $TSTDPUBASG SET
c_id = $course_id ,
expires_on = '0000-00-00 00:00:00',
ends_on = '0000-00-00 00:00:00',
add_to_calendar = '$agenda_id',
enable_qualification = '".$enable_calification."',
publication_id = '".$id."'";
Database::query($sql_add_homework);
$inserted_id = Database::insert_id();
$sql_add_publication = "UPDATE $work_table SET has_properties = $inserted_id, view_properties = 0 WHERE c_id = $course_id AND id = $id";
Database::query($sql_add_publication);
}
if (!empty($_POST['category_id'])) {
if (isset($_POST['make_calification']) && $_POST['make_calification'] == 1) {
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/gradebookitem.class.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/evaluation.class.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/abstractlink.class.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
$resource_name = $_POST['new_dir'];
add_resource_to_course_gradebook($_POST['category_id'], api_get_course_id(), 3, $id, $resource_name, $_POST['weight'], $_POST['qualification_value'], $_POST['description'], 1, api_get_session_id());
}
}
if (api_get_course_setting('email_alert_students_on_new_homework') == 1) {
send_email_on_homework_creation(api_get_course_id());
}
$result = addDir($_POST, $user_id, $_course, $group_id, $id_session);
if ($result) {
Display::display_confirmation_message(get_lang('DirectoryCreated'), false);
} else {
Display :: display_error_message(get_lang('CannotCreateDir'));
Display::display_error_message(get_lang('CannotCreateDir'));
}
} else {
$form->display();
@ -485,6 +212,7 @@ switch ($action) {
}
case 'make_visible':
case 'delete':
case 'delete_dir':
case 'make_invisible':
case 'move':
case 'move_to':
@ -504,12 +232,12 @@ switch ($action) {
if (move($course_dir.'/'.$path, $base_work_dir . $move_to_path)) {
// Update db
update_work_url($item_id, 'work' . $move_to_path, $_REQUEST['move_to_id']);
updateWorkUrl($item_id, 'work' . $move_to_path, $_REQUEST['move_to_id']);
api_item_property_update($_course, 'work', $_REQUEST['move_to_id'], 'FolderUpdated', $user_id);
Display :: display_confirmation_message(get_lang('DirMv'));
Display::display_confirmation_message(get_lang('DirMv'));
} else {
Display :: display_error_message(get_lang('Impossible'));
Display::display_error_message(get_lang('Impossible'));
}
} else {
Display :: display_error_message(get_lang('Impossible'));
@ -519,27 +247,16 @@ switch ($action) {
/* Move file form request */
if ($is_allowed_to_edit && $action == 'move') {
if (!empty($item_id)) {
$folders = array();
$session_id = api_get_session_id();
$session_id == 0 ? $withsession = " AND session_id = 0 " : $withsession = " AND session_id='".$session_id."'";
$sql = "SELECT id, url, title FROM $work_table
WHERE c_id = $course_id AND active IN (0, 1) AND url LIKE '/%' AND post_group_id = '".$group_id."'".$withsession;
$res = Database::query($sql);
while ($folder = Database::fetch_array($res)) {
$folders[$folder['id']] = $folder['title'];
}
echo build_work_move_to_selector($folders, $curdirpath, $item_id);
echo generateMoveForm($item_id, $curdirpath, $course_info, $group_id, $session_id);
}
}
/* MAKE VISIBLE WORK COMMAND */
/* Visible */
if ($is_allowed_to_edit && $action == 'make_visible') {
if (!empty($item_id)) {
if (isset($item_id) && $item_id == 'all') {
} else {
$sql = "UPDATE " . $work_table . " SET accepted = 1 WHERE c_id = $course_id AND id = '" . $item_id . "'";
Database::query($sql);
api_item_property_update($course_info, 'work', $item_id, 'visible', api_get_user_id());
makeVisible($item_id, $course_info);
Display::display_confirmation_message(get_lang('FileVisible'));
}
}
@ -547,112 +264,42 @@ switch ($action) {
if ($is_allowed_to_edit && $action == 'make_invisible') {
/* MAKE INVISIBLE WORK COMMAND */
/* Invisible */
if (!empty($item_id)) {
if (isset($item_id) && $item_id == 'all') {
} else {
$sql = "UPDATE " . $work_table . " SET accepted = 0
WHERE c_id = $course_id AND id = '" . $item_id . "'";
Database::query($sql);
api_item_property_update($course_info, 'work', $item_id, 'invisible', api_get_user_id());
makeInvisible($item_id, $course_info);
Display::display_confirmation_message(get_lang('FileInvisible'));
}
}
}
/* Delete dir command */
/* Delete dir */
if ($is_allowed_to_edit && !empty($_REQUEST['delete_dir'])) {
$delete_dir_id = intval($_REQUEST['delete_dir']);
$locked = api_resource_is_locked_by_gradebook($delete_dir_id, LINK_STUDENTPUBLICATION);
if ($is_allowed_to_edit && $action == 'delete_dir') {
$work_to_delete = get_work_data_by_id($_REQUEST['id']);
$result = deleteDirWork($_REQUEST['id']);
if ($locked == false) {
$work_to_delete = get_work_data_by_id($delete_dir_id);
del_dir($delete_dir_id);
// gets calendar_id from student_publication_assigment
$sql = "SELECT add_to_calendar FROM $TSTDPUBASG WHERE c_id = $course_id AND publication_id ='$delete_dir_id'";
$res = Database::query($sql);
$calendar_id = Database::fetch_row($res);
// delete from agenda if it exists
if (!empty($calendar_id[0])) {
$t_agenda = Database::get_course_table(TABLE_AGENDA);
$sql = "DELETE FROM $t_agenda WHERE c_id = $course_id AND id ='".$calendar_id[0]."'";
Database::query($sql);
}
$sql = "DELETE FROM $TSTDPUBASG WHERE c_id = $course_id AND publication_id ='$delete_dir_id'";
Database::query($sql);
$link_info = is_resource_in_course_gradebook(api_get_course_id(), 3 , $delete_dir_id, api_get_session_id());
$link_id = $link_info['id'];
if ($link_info !== false) {
remove_resource_from_course_gradebook($link_id);
}
Display :: display_confirmation_message(get_lang('DirDeleted') . ': '.$work_to_delete['title']);
} else {
Display::display_warning_message(get_lang('ResourceLockedByGradebook'));
if ($result) {
Display::display_confirmation_message(get_lang('DirDeleted') . ': '.$work_to_delete['title']);
}
}
/* DELETE WORK COMMAND */
/* Delete document */
if ($action == 'delete' && $item_id) {
$file_deleted = false;
$is_author = user_is_author($item_id);
$work_data = get_work_data_by_id($item_id);
$locked = api_resource_is_locked_by_gradebook($work_data['parent_id'], LINK_STUDENTPUBLICATION);
if (($is_allowed_to_edit && $locked == false) || ($locked == false AND $is_author && api_get_course_setting('student_delete_own_publication') == 1 && $work_data['qualificator_id'] == 0)) {
//we found the current user is the author
$queryString1 = "SELECT url, contains_file FROM ".$work_table." WHERE c_id = $course_id AND id = $item_id";
$result1 = Database::query($queryString1);
$row = Database::fetch_array($result1);
if (Database::num_rows($result1) > 0) {
$queryString2 = "UPDATE " . $work_table . " SET active = 2 WHERE c_id = $course_id AND id = $item_id";
$queryString3 = "DELETE FROM ".$TSTDPUBASG ." WHERE c_id = $course_id AND publication_id = $item_id";
Database::query($queryString2);
Database::query($queryString3);
api_item_property_update($_course, 'work', $item_id, 'DocumentDeleted', $user_id);
$work = $row['url'];
if ($row['contains_file'] == 1) {
if (!empty($work)) {
if (api_get_setting('permanently_remove_deleted_files') == 'true') {
my_delete($currentCourseRepositorySys.'/'.$work);
Display::display_confirmation_message(get_lang('TheDocumentHasBeenDeleted'));
$file_deleted = true;
} else {
$extension = pathinfo($work, PATHINFO_EXTENSION);
$new_dir = $work.'_DELETED_'.$item_id.'.'.$extension;
if (file_exists($currentCourseRepositorySys.'/'.$work)) {
rename($currentCourseRepositorySys.'/'.$work, $currentCourseRepositorySys.'/'.$new_dir);
Display::display_confirmation_message(get_lang('TheDocumentHasBeenDeleted'));
$file_deleted = true;
}
}
}
} else {
$file_deleted = true;
}
}
}
$file_deleted = deleteWorkItem($item_id, $_course);
if (!$file_deleted) {
Display::display_error_message(get_lang('YouAreNotAllowedToDeleteThisDocument'));
} else {
Display::display_confirmation_message(get_lang('TheDocumentHasBeenDeleted'));
}
}
/* Display list of student publications */
if (!empty($my_folder_data['description'])) {
echo '<p><div><strong>'.get_lang('Description').':</strong><p>'.Security::remove_XSS($my_folder_data['description'], STUDENT).'</p></div></p>';
echo '<p><div><strong>'.
get_lang('Description').':</strong><p>'.Security::remove_XSS($my_folder_data['description'], STUDENT).
'</p></div></p>';
}
$my_folder_data = get_work_data_by_id($work_id);
@ -663,58 +310,19 @@ switch ($action) {
}
if (api_is_allowed_to_edit()) {
$userList = getWorkUserList($course_code, $session_id);
// Work list
echo '<div class="row">';
echo '<div class="span9">';
if (!empty($group_id)) {
$userList = GroupManager::get_users($group_id);
} else {
if (empty($session_id)) {
$userList = CourseManager::get_user_list_from_course_code($course_code, $session_id, null, null, STUDENT);
} else {
$userList = CourseManager::get_user_list_from_course_code($course_code, $session_id, null, null, 0);
}
$userList = array_keys($userList);
}
display_student_publications_list($work_id, $my_folder_data, $work_parents, $origin, $add_query, $userList);
$grid = showTeacherWorkGrid();
echo $grid ;
echo '</div>';
echo '<div class="span3">';
$table = new HTML_Table(array('class' => 'data_table'));
$column = 0;
$row = 0;
$headers = array(get_lang('Students'), get_lang('Works'));
foreach ($headers as $header) {
$table->setHeaderContents($row, $column, $header);
$column++;
}
$row++;
$column = 0;
foreach ($userList as $userId) {
$user = api_get_user_info($userId);
$link = api_get_path(WEB_CODE_PATH).'work/student_work.php?'.api_get_cidreq().'&studentId='.$user['user_id'];
$url = Display::url(api_get_person_name($user['firstname'], $user['lastname']), $link);
$table->setCellContents($row, $column, $url);
$column++;
$userWorks = 0;
foreach ($work_parents as $work) {
$userWorks += getUniqueStudentAttempts($work->id, $group_id, $course_id, $session_id, $user['user_id']);
}
$cell = $userWorks." / ".count($work_parents);
$table->setCellContents($row, $column, $cell);
$row++;
$column = 0;
}
echo $table->toHtml();
echo showStudentList($userList, $work_parents, $group_id, $course_id, $session_id);
echo '</div>';
} else {
display_student_publications_list($work_id, $my_folder_data, $work_parents, $origin, $add_query, null);
echo showStudentWorkGrid();
}
break;
}

@ -1,8 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
use ChamiloSession as Session;
$language_file = array('exercice', 'work', 'document', 'admin', 'gradebook');
require_once '../inc/global.inc.php';
@ -58,6 +56,7 @@ $interbreadcrumb[] = array ('url' => api_get_path(WEB_CODE_PATH).'work/work.php?
$interbreadcrumb[] = array ('url' => api_get_path(WEB_CODE_PATH).'work/work_list.php?'.api_get_cidreq().'&id='.$workId, 'name' => $my_folder_data['title']);
Display :: display_header(null);
$documentsAddedInWork = getAllDocumentsFromWorkToString($workId, $courseInfo);
echo '<div class="actions">';
@ -83,18 +82,30 @@ if (!empty($my_folder_data['description'])) {
echo $documentsAddedInWork;
$result = getWorkDateValidationStatus($work_data);
echo $result['message'];
$check_qualification = intval($my_folder_data['qualification']);
if (!empty($work_data['enable_qualification']) && !empty($check_qualification)) {
$type = 'simple';
$columns = array(get_lang('Type'), get_lang('FirstName'), get_lang('LastName'), get_lang('Title'), get_lang('Qualification'), get_lang('Date'), get_lang('Status'), get_lang('Actions'));
$columns = array(
get_lang('Type'),
get_lang('FirstName'),
get_lang('LastName'),
get_lang('Title'),
get_lang('Qualification'),
get_lang('Date'),
get_lang('Status'),
get_lang('Actions')
);
$column_model = array (
array('name'=>'type', 'index'=>'file', 'width'=>'12', 'align'=>'left', 'search' => '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'=>'username', 'index'=>'username', 'width'=>'30', 'align'=>'left', 'search' => 'true'),
array('name'=>'title', 'index'=>'title', 'width'=>'40', 'align'=>'left', 'search' => 'false', 'wrap_cell' => 'true'),
// array('name'=>'file', 'index'=>'file', 'width'=>'20', 'align'=>'left', 'search' => 'false'),
array('name'=>'qualification', 'index'=>'qualification', 'width'=>'20', 'align'=>'left', 'search' => 'true'),
array('name'=>'sent_date', 'index'=>'sent_date', 'width'=>'50', 'align'=>'left', 'search' => 'true', 'wrap_cell' => 'true'),
array('name'=>'qualificator_id','index'=>'qualificator_id', 'width'=>'30', 'align'=>'left', 'search' => 'true'),
@ -102,17 +113,22 @@ if (!empty($work_data['enable_qualification']) && !empty($check_qualification))
);
} else {
$type = 'complex';
$columns = array(get_lang('Type'), get_lang('FirstName'), get_lang('LastName'), get_lang('Title'), get_lang('Date'), get_lang('Actions'));
$columns = array(
get_lang('Type'),
get_lang('FirstName'),
get_lang('LastName'),
get_lang('Title'),
get_lang('Date'),
get_lang('Actions')
);
$column_model = array (
array('name'=>'type', 'index'=>'file', 'width'=>'12', 'align'=>'left', 'search' => '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'=>'username', 'index'=>'username', 'width'=>'30', 'align'=>'left', 'search' => 'true'),
array('name'=>'title', 'index'=>'title', 'width'=>'40', 'align'=>'left', 'search' => 'false', 'wrap_cell' => "true"),
// array('name'=>'file', 'index'=>'file', 'width'=>'20', 'align'=>'left', 'search' => 'false'),
//array('name'=>'qualification', 'index'=>'qualification', 'width'=>'20', 'align'=>'left', 'search' => 'true'),
array('name'=>'sent_date', 'index'=>'sent_date', 'width'=>'50', 'align'=>'left', 'search' => 'true', 'wrap_cell' => 'true'),
//array('name'=>'qualificator_id','index'=>'qualificator_id', 'width'=>'30', 'align'=>'left', 'search' => 'true'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'40', 'align'=>'left', 'search' => 'false', 'sortable'=>'false')
);
}

@ -1,8 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
use ChamiloSession as Session;
$language_file = array('exercice', 'work', 'document', 'admin', 'gradebook');
require_once '../inc/global.inc.php';

@ -71,17 +71,6 @@ class TestWork extends UnitTestCase {
//var_dump($res);
}
/**
* @param string e.g converts "2008-10-06 12:45:00" to timestamp
*/
function testconvert_date_to_number() {
$default='2008-10-06 12:45:00';
$res=convert_date_to_number($default);
$this->assertTrue(is_numeric($res));
//var_dump($res);
}
/**
* This function displays the number of files contained in a directory
* @param string the path of the directory complete e.g. /var/www/dokeos
@ -180,7 +169,7 @@ class TestWork extends UnitTestCase {
$origin='learnpath';
$add_in_where_query='';
ob_start();
$res=display_student_publications_list($work_dir,$sub_course_dir,$currentCourseRepositoryWeb, $link_target_parameter, $dateFormatLong, $origin,$add_in_where_query='');
$res=display_student_publications_list($work_dir,$sub_course_dir,$currentCourseRepositoryWeb, $link_target_parameter, $dateFormatLong, $origin);
$this->assertTrue(is_null($res));
ob_end_clean();
//var_dump($res);

Loading…
Cancel
Save