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

Add special csv conditions see BT#12156

Browse Source 
See comment 83
pull/2487/head
jmontoyaa 9 years ago
parent e7e88436f2
commit 3d58dd7b5d
1 changed files with 13 additions and 9 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. 22
      main/cron/import_csv.php

22
main/cron/import_csv.php
Unescape View File

@ -910,7 +910,8 @@ class ImportCsv
$batchSize = $this->batchSize;
$counter = 1;
$em = Database::getManager();
$eventSentMailList = [];
$eventStartDateList = [];
$eventEndDateList = [];
$report = [
'mail_sent' => 0,
'mail_not_sent_announcement_exists' => 0,
@ -962,17 +963,19 @@ class ImportCsv
$event['item'] = $item;
$event['external_event_id'] = $externalEventId;
if (isset($eventSentMailList[$courseInfo['real_id']]) &&
isset($eventSentMailList[$courseInfo['real_id']][$event['session_id']])
if (isset($eventStartDateList[$courseInfo['real_id']]) &&
isset($eventStartDateList[$courseInfo['real_id']][$event['session_id']])
) {
$currentItemDate = api_strtotime($event['start']);
$firstDate = $eventSentMailList[$courseInfo['real_id']][$event['session_id']];
$firstDate = $eventStartDateList[$courseInfo['real_id']][$event['session_id']];
if ($currentItemDate < api_strtotime($firstDate)) {
$eventSentMailList[$courseInfo['real_id']][$event['session_id']] = $event['start'];
$eventStartDateList[$courseInfo['real_id']][$event['session_id']] = $event['start'];
$eventEndDateList[$courseInfo['real_id']][$event['session_id']] = $event['end'];
}
} else {
// First time
$eventSentMailList[$courseInfo['real_id']][$event['session_id']] = $event['start'];
$eventStartDateList[$courseInfo['real_id']][$event['session_id']] = $event['start'];
$eventEndDateList[$courseInfo['real_id']][$event['session_id']] = $event['end'];
}
$eventsToCreateFinal[] = $event;
}
@ -1018,7 +1021,8 @@ class ImportCsv
// Taking first element of course-session event
$alreadyAdded = false;
$firstDate = $eventSentMailList[$courseInfo['real_id']][$event['session_id']];
$firstDate = $eventStartDateList[$courseInfo['real_id']][$event['session_id']];
$firstEndDate = $eventEndDateList[$courseInfo['real_id']][$event['session_id']];
if (isset($eventAlreadySent[$courseInfo['real_id']]) &&
isset($eventAlreadySent[$courseInfo['real_id']][$event['session_id']])
@ -1045,8 +1049,8 @@ class ImportCsv
// Send announcement to users
if ($sendMail && $alreadyAdded == false) {
$start = $event['start'];
$end = $event['end'];
$start = $firstDate;
$end = $firstEndDate;
if (!empty($end) &&
api_format_date($start, DATE_FORMAT_LONG) == api_format_date($end, DATE_FORMAT_LONG)

Write Preview
Loading…
Cancel
Save