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

Notification: Format + readability code - refs BT#19838

Browse Source
pull/4244/head
Angel Fernando Quiroz Campos 3 years ago
parent 3dcefb8156
commit 4d1ced3eda
5 changed files with 75 additions and 66 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. 2
      main/inc/ajax/message.ajax.php
  2. 115
      main/inc/lib/NotificationEvent.php
  3. 4
      main/notification_event/add.php
  4. 4
      main/notification_event/edit.php
  5. 16
      main/notification_event/list.php

2
main/inc/ajax/message.ajax.php
Unescape View File

@ -29,7 +29,7 @@ switch ($action) {
break;
case 'mark_notification_as_read':
if (api_get_configuration_value('notification_event')) {
$id = isset($_REQUEST['id']) ? $_REQUEST['id'] : 0;
$id = $_REQUEST['id'] ?? 0;
$notificationManager = new NotificationEvent();
$notificationManager->markAsRead($id);
echo 1;

115
main/inc/lib/NotificationEvent.php
Unescape View File

@ -5,6 +5,7 @@ class NotificationEvent extends Model
{
const ACCOUNT_EXPIRATION = 1;
const JUSTIFICATION_EXPIRATION = 2;
public $table;
public $columns = [
'id',
@ -48,7 +49,7 @@ class NotificationEvent extends Model
return $eventTypes;
}
public function getForm(FormValidator $form, $data = [])
public function getForm(FormValidator $form, $data = []): FormValidator
{
$options = $this->getEventsForSelect();
$form->addSelect('event_type', get_lang('EventType'), $options);
@ -80,7 +81,7 @@ class NotificationEvent extends Model
return $form;
}
public function getAddForm(FormValidator $form)
public function getAddForm(FormValidator $form): FormValidator
{
$options = $this->getEventsForSelect();
$eventType = $form->getSubmitValue('event_type');
@ -123,26 +124,22 @@ class NotificationEvent extends Model
{
$data = UserManager::get_extra_user_data_by_field($userId, $this->extraFieldName);
return isset($data['notification_event']) ? $data['notification_event'] : '';
return $data['notification_event'] ?? '';
}
public function getNotificationsByUser($userId)
/**
* @throws Exception
*/
public function getNotificationsByUser(int $userId): array
{
$userInfo = api_get_user_info($userId);
$events = $this->get_all();
$extraFieldData = $this->getUserExtraData(api_get_user_id());
$allowJustification = api_get_plugin_setting('justification', 'tool_enable') === 'true';
$userJustificationList = [];
if ($allowJustification) {
$plugin = Justification::create();
$userJustificationList = $plugin->getUserJustificationList($userId);
}
$extraFieldData = $this->getUserExtraData($userId);
$notifications = [];
foreach ($events as $event) {
$days = (int) $event['day_diff'];
$checkIsRead = $event['persistent'] == 0 ? true : false;
$checkIsRead = $event['persistent'] == 0;
$eventItemId = $event['event_id'];
switch ($event['event_type']) {
@ -171,45 +168,50 @@ class NotificationEvent extends Model
}
break;
case self::JUSTIFICATION_EXPIRATION:
if (!empty($userJustificationList)) {
foreach ($userJustificationList as $userJustification) {
if (empty($userJustification['date_validity'])) {
continue;
}
if ($eventItemId != $userJustification['justification_document_id']) {
continue;
}
$showNotification = $this->showNotification($userJustification['date_validity'], $days);
$id = 'id_'.self::JUSTIFICATION_EXPIRATION.'_event_'.$event['id'].'_'.$userJustification['id'];
$fieldData = $plugin->getJustification($userJustification['justification_document_id']);
$read = false;
if ($checkIsRead) {
$read = $this->isRead($id, $extraFieldData);
}
$eventText = $plugin->get_lang('Justification').': '.$fieldData['name'].' <br />';
$eventText .= $plugin->get_lang('JustificationDate').': '.$userJustification['date_validity'];
$url = $event['link'];
if (empty($url)) {
$url = api_get_path(WEB_CODE_PATH).'auth/justification.php#'.$fieldData['code'];
}
if ($showNotification && $read === false) {
$notifications[] = [
'id' => $id,
'title' => $event['title'],
'content' => $event['content'],
'event_text' => $eventText,
'link' => $url,
'persistent' => $event['persistent'],
];
}
if (api_get_plugin_setting('justification', 'tool_enable') !== 'true') {
break;
}
$plugin = Justification::create();
$userJustificationList = $plugin->getUserJustificationList($userId);
foreach ($userJustificationList as $userJustification) {
if (empty($userJustification['date_validity'])) {
continue;
}
if ($eventItemId != $userJustification['justification_document_id']) {
continue;
}
$showNotification = $this->showNotification($userJustification['date_validity'], $days);
$id = 'id_'.self::JUSTIFICATION_EXPIRATION.'_event_'.$event['id'].'_'.$userJustification['id'];
$fieldData = $plugin->getJustification($userJustification['justification_document_id']);
$read = false;
if ($checkIsRead) {
$read = $this->isRead($id, $extraFieldData);
}
$eventText = $plugin->get_lang('Justification').': '.$fieldData['name'].' <br />';
$eventText .= $plugin->get_lang('JustificationDate').': '.$userJustification['date_validity'];
$url = $event['link'];
if (empty($url)) {
$url = api_get_path(WEB_CODE_PATH).'auth/justification.php#'.$fieldData['code'];
}
if ($showNotification && $read === false) {
$notifications[] = [
'id' => $id,
'title' => $event['title'],
'content' => $event['content'],
'event_text' => $eventText,
'link' => $url,
'persistent' => $event['persistent'],
];
}
}
break;
@ -219,7 +221,7 @@ class NotificationEvent extends Model
return $notifications;
}
public function isRead($id, $extraData)
public function isRead($id, $extraData): bool
{
$userId = api_get_user_id();
@ -241,7 +243,7 @@ class NotificationEvent extends Model
return false;
}
public function markAsRead($id)
public function markAsRead($id): bool
{
if (empty($id)) {
return false;
@ -261,7 +263,10 @@ class NotificationEvent extends Model
return true;
}
public function showNotification($date, $dayDiff)
/**
* @throws Exception
*/
public function showNotification($date, $dayDiff): bool
{
$today = api_get_utc_datetime();
$expiration = api_get_utc_datetime($date, false, true);

4
main/notification_event/add.php
Unescape View File

@ -18,7 +18,9 @@ $form = $manager->getAddForm($form);
if (isset($_POST) && isset($_POST['title']) && $form->validate()) {
$values = $form->getSubmitValues();
$manager->save($values);
Display::addFlash(Display::return_message(get_lang('Saved')));
Display::addFlash(
Display::return_message(get_lang('Saved'), 'success')
);
$url = api_get_path(WEB_CODE_PATH).'notification_event/list.php?';
header('Location: '.$url);
exit;

4
main/notification_event/edit.php
Unescape View File

@ -35,7 +35,9 @@ if ($form->validate()) {
$values['id'] = $id;
$values['persistent'] = isset($values['persistent']) ? 1 : 0;
$manager->update($values);
Display::addFlash(get_lang('Updated'));
Display::addFlash(
Display::return_message(get_lang('Updated'), 'success')
);
$url = api_get_path(WEB_CODE_PATH).'notification_event/list.php?';
header('Location: '.$url);
exit;

16
main/notification_event/list.php
Unescape View File

@ -21,17 +21,17 @@ $tpl->assign('list', $list);
$content = $tpl->fetch($tpl->get_template('notification_event/list.tpl'));
$actionLinks = '';
$action = isset($_REQUEST['a']) ? $_REQUEST['a'] : '';
$action = $_REQUEST['a'] ?? '';
$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
switch ($action) {
case 'delete':
$manager->delete($id);
if ($action == 'delete') {
$manager->delete($id);
Display::addFlash(Display::return_message(get_lang('Deleted')));
header('Location: '.api_get_self());
exit;
break;
Display::addFlash(
Display::return_message(get_lang('Deleted'), 'success')
);
header('Location: '.api_get_self());
exit;
}
$actionLinks .= Display::toolbarButton(

Write Preview
Loading…
Cancel
Save