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

Fix announcement date see BT#13083

Browse Source
pull/2487/head
jmontoyaa 8 years ago
parent 0aeee1f1bc
commit bfa83db99d
2 changed files with 77 additions and 31 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. 18
      main/announcements/announcements.php
  2. 90
      main/inc/lib/AnnouncementManager.php

18
main/announcements/announcements.php
Unescape View File

@ -67,7 +67,6 @@ $sessionId = api_get_session_id();
if (!empty($group_id)) {
$group_properties = GroupManager:: get_group_properties($group_id);
$interbreadcrumb[] = array(
"url" => api_get_path(WEB_CODE_PATH)."group/group.php?".api_get_cidreq(),
"name" => get_lang('Groups'),
@ -196,7 +195,12 @@ switch ($action) {
// jqgrid will use this URL to do the selects
$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_course_announcements&'.api_get_cidreq().'&title_to_search='.$keyword.'&user_id_to_search='.$userIdToSearch;
$deleteUrl = api_get_path(WEB_AJAX_PATH).'announcement.ajax.php?a=delete_item&'.api_get_cidreq();
$columns = array(get_lang('Title'), get_lang('By'), get_lang('LastUpdateDate'), get_lang('Actions'));
$columns = array(
get_lang('Title'),
get_lang('By'),
get_lang('LastUpdateDate'),
get_lang('Actions')
);
// Column config
$columnModel = array(
@ -215,8 +219,8 @@ switch ($action) {
'sortable' => 'false',
),
array(
'name' => 'insert_date',
'index' => 'insert_date',
'name' => 'lastedit_date',
'index' => 'lastedit_date',
'width' => '200',
'align' => 'left',
'sortable' => 'false',
@ -266,7 +270,11 @@ switch ($action) {
});
</script>';
$count = AnnouncementManager::getAnnouncements($stok, $announcement_number, true);
$count = AnnouncementManager::getAnnouncements(
$stok,
$announcement_number,
true
);
if (empty($count)) {
$html = '';

90
main/inc/lib/AnnouncementManager.php
Unescape View File

@ -400,17 +400,12 @@ class AnnouncementManager
api_get_session_id()
);
$lastEdit = $itemProperty->getLasteditDate();
$html .= "<tr><td>$content</td></tr>";
$html .= "<tr><td class=\"announcements_datum\">".get_lang('LastUpdateDate')." : ".
Display::dateToStringAgoAndLongDate(
!empty($lastEdit) ? $lastEdit->format('Y-m-d h:i:s') : ''
)."</td></tr>";
if ($itemProperty->getGroup() !== null) {
$sent_to_icon = Display::return_icon('group.gif', get_lang('AnnounceSentToUserSelection'));
}
$html .= "<tr>";
$html .= "<td class=\"announcements_datum\">".get_lang('LastUpdateDate')." : ";
$lastEdit = $itemProperty->getLasteditDate();
$html .= Display::dateToStringAgoAndLongDate($lastEdit);
$html .= "</td></tr>";
if (api_is_allowed_to_edit(false, true)) {
$sent_to = self::sent_to('announcement', $id);
@ -772,7 +767,7 @@ class AnnouncementManager
}
}
// we remove everything from item_property for this
// We remove everything from item_property for this
$sql = "DELETE FROM $tbl_item_property
WHERE c_id = $course_id AND ref='$id' AND tool='announcement'";
Database::query($sql);
@ -1388,10 +1383,19 @@ class AnnouncementManager
$course_id = $courseId ?: api_get_course_int_id();
$_course = api_get_course_info();
$group_memberships = GroupManager::get_group_ids($course_id, api_get_user_id());
$group_memberships = GroupManager::get_group_ids(
$course_id,
api_get_user_id()
);
$allowUserEditSetting = api_get_course_setting('allow_user_edit_announcement');
$select = ' DISTINCT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date';
$select = ' DISTINCT
announcement.*,
ip.visibility,
ip.to_group_id,
ip.insert_user_id,
ip.insert_date,
ip.lastedit_date';
if ($getCount) {
$select = ' COUNT(DISTINCT announcement.iid) count';
}
@ -1612,12 +1616,35 @@ class AnnouncementManager
$displayed = [];
$results = [];
$actionUrl = api_get_path(WEB_CODE_PATH).'announcements/announcements.php?'.api_get_cidreq();
$emailIcon = Display::return_icon(
'email.gif',
get_lang('AnnounceSentByEmail')
);
$attachmentIcon = Display::return_icon(
'attachment.gif',
get_lang('Attachment')
);
$editIcon = Display::return_icon(
'edit.png',
get_lang('Edit'),
'',
ICON_SIZE_SMALL
);
$deleteIcon = Display::return_icon(
'delete.png',
get_lang('Delete'),
'',
ICON_SIZE_SMALL
);
while ($myrow = Database::fetch_array($result, 'ASSOC')) {
if (!in_array($myrow['id'], $displayed)) {
$sent_to_icon = '';
// the email icon
if ($myrow['email_sent'] == '1') {
$sent_to_icon = ' '.Display::return_icon('email.gif', get_lang('AnnounceSentByEmail'));
$sent_to_icon = ' '.$emailIcon;
}
$groupReference = ($myrow['to_group_id'] > 0) ? ' <span class="label label-info">'.get_lang('Group').'</span> ' : '';
$title = $myrow['title'].$groupReference.$sent_to_icon;
@ -1629,26 +1656,31 @@ class AnnouncementManager
$attachment_icon = '';
if (count($attachment_list) > 0) {
$attachment_icon = ' '.Display::return_icon('attachment.gif', get_lang('Attachment'));
$attachment_icon = ' '.$attachmentIcon;
}
/* TITLE */
$user_info = api_get_user_info($myrow['insert_user_id']);
$username = sprintf(get_lang("LoginX"), $user_info['username']);
$username_span = Display::tag('span', api_get_person_name($user_info['firstName'], $user_info['lastName']), array('title'=>$username));
$title = Display::url($title.$attachment_icon, $actionUrl.'&action=view&id='.$myrow['id']);
//$html .= Display::tag('td', $username_span, array('class' => 'announcements-list-line-by-user'));
//$html .= Display::tag('td', api_convert_and_format_date($myrow['insert_date'], DATE_TIME_FORMAT_LONG), array('class' => 'announcements-list-line-datetime'));
$modify_icons = '';
$username_span = Display::tag(
'span',
$user_info['complete_name'],
array('title' => $username)
);
$title = Display::url(
$title.$attachment_icon,
$actionUrl.'&action=view&id='.$myrow['id']
);
// we can edit if : we are the teacher OR the element belongs to
// the session we are coaching OR the option to allow users to edit is on
if (api_is_allowed_to_edit(false, true) ||
(api_is_session_general_coach() && api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $myrow['id']))
|| (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())
) {
$modify_icons = "<a href=\"".$actionUrl."&action=modify&id=".$myrow['id']."\">".
Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL)."</a>";
$modify_icons = "<a href=\"".$actionUrl."&action=modify&id=".$myrow['id']."\">".$editIcon."</a>";
if ($myrow['visibility'] == 1) {
$image_visibility = "visible";
$alt_visibility = get_lang('Hide');
@ -1674,8 +1706,7 @@ class AnnouncementManager
}
if (api_is_allowed_to_edit(false, true)) {
$modify_icons .= "<a href=\"".$actionUrl."&action=delete&id=".$myrow['id']."&sec_token=".$stok."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, api_get_system_encoding()))."')) return false;\">".
Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).
"</a>";
$deleteIcon."</a>";
}
$iterator++;
} else {
@ -1686,10 +1717,17 @@ class AnnouncementManager
}
$announcement = [
'id' => $myrow["id"],
'id' => $myrow['id'],
'title' => $title,
'username' => $username_span,
'insert_date' => api_convert_and_format_date($myrow['insert_date'], DATE_TIME_FORMAT_LONG),
'insert_date' => api_convert_and_format_date(
$myrow['insert_date'],
DATE_TIME_FORMAT_LONG
),
'lastedit_date' => api_convert_and_format_date(
$myrow['lastedit_date'],
DATE_TIME_FORMAT_LONG
),
'actions' => $modify_icons
];

Write Preview
Loading…
Cancel
Save