From 8b4da8e73a0a9915b473f8f4ad6571e2ce3eb1ec Mon Sep 17 00:00:00 2001 From: Alex Aragon Date: Mon, 18 Jul 2016 18:45:56 -0500 Subject: [PATCH 1/2] change of appearance of widget user invitations pending - refs BT#7683 --- app/Resources/public/css/base.css | 11 +++++ main/social/invitations.php | 1 + main/social/profile.php | 52 ++++++++++-------------- main/template/default/social/profile.tpl | 3 ++ 4 files changed, 36 insertions(+), 31 deletions(-) diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 8a1fd5fe92..38793b9efc 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -5820,6 +5820,17 @@ footer{ .list-backups-options{ list-style: none; } +#invitations-acordion .list-group{ + margin-bottom: 10px; +} +#invitations-acordion .list-group .list-group-item{ + padding: 0; + border: none; + margin-top: 5px; +} +#invitations-acordion .list-group .list-group-item img{ + margin-right: 5px; +} /* CSS NEW TOP ******************************************************************************/ /* CSS Responsive */ @media (min-width: 1025px) and (max-width: 1200px) { diff --git a/main/social/invitations.php b/main/social/invitations.php index c950786842..cded8b604a 100755 --- a/main/social/invitations.php +++ b/main/social/invitations.php @@ -110,6 +110,7 @@ if ($total_invitations == 0 && count($_GET) <= 0) { if ($number_loop != 0) { $invitationHtml = ''; + foreach ($list_get_invitation as $invitation) { $sender_user_id = $invitation['user_sender_id']; $user_info = api_get_user_info($sender_user_id); diff --git a/main/social/profile.php b/main/social/profile.php index dea99d7246..c6eb35ecec 100755 --- a/main/social/profile.php +++ b/main/social/profile.php @@ -192,7 +192,7 @@ function register_friend(element_input) { $.ajax({ contentType: "application/x-www-form-urlencoded", beforeSend: function(objeto) { - $("div#dpending_"+user_friend_id).html(""); + $("li#dpending_"+user_friend_id).html(""); }, type: "POST", url: "'.api_get_path(WEB_AJAX_PATH).'social.ajax.php?a=add_friend", @@ -596,40 +596,29 @@ if ($show_full_profile) { //Pending invitations if (!isset($_GET['u']) || (isset($_GET['u']) && $_GET['u']==api_get_user_id())) { if ($count_pending_invitations > 0) { - $invitations = '

'.get_lang('PendingInvitations').'

'; + + $invitations = ''; + $listInvitations = Display::panelCollapse(get_lang('PendingInvitations'), $invitations, 'invitations', null, 'invitations-acordion', 'invitations-collapse'); + } } @@ -697,6 +686,7 @@ $tpl->assign('social_group_info_block', $social_group_info_block); $tpl->assign('social_rss_block', $social_rss_block); $tpl->assign('social_skill_block', SocialManager::getSkillBlock($my_user_id)); $tpl->assign('sessionList', $social_session_block); +$tpl->assign('invitations', $listInvitations); $tpl->assign('social_right_information', $socialRightInformation); $tpl->assign('social_auto_extend_link', $socialAutoExtendLink); diff --git a/main/template/default/social/profile.tpl b/main/template/default/social/profile.tpl index 84907d1364..f487f56bc7 100644 --- a/main/template/default/social/profile.tpl +++ b/main/template/default/social/profile.tpl @@ -91,6 +91,9 @@ {% endif %} + + {{ invitations }} + {{ social_rss_block }} {{ social_right_information }} From 1fc7546107e4d1dd9a8e38644678484bd74aedbe Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Mon, 18 Jul 2016 18:49:13 -0500 Subject: [PATCH 2/2] Save c_student_publication with session = null instead of session = 0 --- main/admin/user_move_stats.php | 82 ++++---- main/gradebook/gradebook_edit_all.php | 1 - main/gradebook/gradebook_edit_link.php | 25 ++- main/gradebook/lib/GradebookUtils.php | 24 ++- .../lib/be/studentpublicationlink.class.php | 197 +++++++++--------- main/inc/lib/sessionmanager.lib.php | 13 +- main/work/work.lib.php | 176 +++++++++------- .../Component/CourseCopy/CourseRestorer.php | 4 +- .../Entity/CStudentPublication.php | 11 +- 9 files changed, 294 insertions(+), 239 deletions(-) diff --git a/main/admin/user_move_stats.php b/main/admin/user_move_stats.php index dde0e1b00c..af90e2740f 100755 --- a/main/admin/user_move_stats.php +++ b/main/admin/user_move_stats.php @@ -74,6 +74,7 @@ if (isset($_REQUEST['load_ajax'])) { $origin_course_code = $combination_result['course_code']; $origin_session_id = intval($combination_result['session_id']); $new_session_id = intval($_REQUEST['session_id']); + $session = $em->find('ChamiloCoreBundle:Session', $new_session_id); //if (!isset($_REQUEST['view_stat'])) { if ($origin_session_id == $new_session_id ) { @@ -359,30 +360,28 @@ if (isset($_REQUEST['load_ajax'])) { $dir_name = substr($parent_data['url'], 1); $created_dir = create_unexisting_work_directory($base_work_dir, $dir_name); $created_dir = '/'.$created_dir; - $now = api_get_utc_datetime(); + $now = new DateTime(api_get_utc_datetime(), new DateTimeZone('UTC')); //Creating directory - $sql_add_publication = "INSERT INTO " . $TBL_STUDENT_PUBLICATION . " SET - url = '".$created_dir."', - c_id = $course_id, - title = '".$parent_data['title']."', - description = '".$parent_data['description']." folder_moved_from_session_id_$origin_session_id ', - author = '', - active = '0', - accepted = '1', - filetype = 'folder', - sent_date = '".$now."', - qualification = '".$parent_data['qualification'] ."', - parent_id = '', - qualificator_id = '', - date_of_qualification = '', - session_id = ".$new_session_id; - $rest_insert = Database::query($sql_add_publication); - if ($debug) echo ($sql_add_publication); - // add the directory - $id = Database::insert_id(); + $publication = new \Chamilo\CourseBundle\Entity\CStudentPublication(); + $publication + ->setUrl($created_dir) + ->setCId($course_id) + ->setTitle($parent_data['title']) + ->setDescription( + $parent_data['description'] . "folder_moved_from_session_id_$origin_session_id" + ) + ->setActive(false) + ->setAccepted(true) + ->setFiletype('folder') + ->setSentDate($now) + ->setQualification($parent_data['qualification']) + ->setParentId(0) + ->setQualificatorId(0) + ->setSession($session); + + $id = $publication->getIid(); //Folder created api_item_property_update($course_info, 'work', $id, 'DirectoryCreated', api_get_user_id()); - if ($debug) var_dump($rest_insert); $new_parent_id = $id; $result_message[$TBL_STUDENT_PUBLICATION.' - new folder created called: '.$created_dir]++; } @@ -424,23 +423,25 @@ if (isset($_REQUEST['load_ajax'])) { if ($update_database) { //Creating a new work - $sql_add_publication = "INSERT INTO " . $TBL_STUDENT_PUBLICATION . " SET " . - "url = '" . $new_url . "', - c_id = $course_id, - title = '" . $data['title']. "', - description = '" . $data['description'] . " file moved', - author = '" . $data['author'] . "', - active = '" . $data['active']. "', - accepted = '" . $data['accepted']. "', - post_group_id = " . $data['post_group_id'] . ", - sent_date = '".$data['sent_date'] ."', - parent_id = ".$new_parent_id ." , - session_id = ".$new_session_id; - - if ($debug) echo $sql_add_publication; - $rest_insert = Database::query($sql_add_publication); - if ($debug) var_dump($rest_insert); - $id = Database::insert_id(); + $data['sent_date'] = new DateTime($data['sent_date'], new DateTimeZone('UTC')); + + $publication = new \Chamilo\CourseBundle\Entity\CStudentPublication(); + $publication + ->setUrl($new_url) + ->setCId($course_id) + ->setTitle($data['title']) + ->setDescription($data['description'] . ' file moved') + ->setActive($data['active']) + ->setAccepted($data['accepted']) + ->setPostGroupId($data['post_group_id']) + ->setSentDate($data['sent_date']) + ->setParentId($new_parent_id) + ->setSession($session); + + $em->persist($publication); + $em->flush(); + + $id = $publication->getIid(); api_item_property_update($course_info, 'work', $id, 'DocumentAdded', $user_id); $result_message[$TBL_STUDENT_PUBLICATION]++; @@ -564,8 +565,7 @@ $htmlHeadXtra[] = '