ILB
/
moodle_enrol_ilbead
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Melhorias no plugin de enrol

master
Sesostris Vieira 11 years ago
parent
1a36c597b9
commit
635480a93c
4 changed files with 35 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      lang/en/enrol_ilbead.php
  2. 6
      lang/pt_br/enrol_ilbead.php
  3. 73
      lib.php
  4. 10
      locallib.php

4
lang/en/enrol_ilbead.php
View File

@ -116,3 +116,7 @@ $string['enrolledat'] = 'enrolled at';
$string['abandonalert'] = 'You have abandoned courses and cannot enroll in new courses.';
$string['abandonpunishment'] = 'Days of punishment for abandon';
$string['abandonpunishment_help'] = 'Number of days that the user cannot enroll in another ILB EAD course after abandon any ILB EAD course.';
$string['coursename'] = 'Course name';
$string['timestart'] = 'Time start';
$string['timeend'] = 'Expected time end';
$string['maxongoingmessage'] = 'You are already enrolled in {$a} ILB/EAD courses, New enrollments will only be accepted after the completion of at least one of them.';

6
lang/pt_br/enrol_ilbead.php
View File

@ -114,5 +114,9 @@ $string['ongoingcourses'] = 'Lista de cursos que você não concluiu';
$string['abandonedcourses'] = 'Cursos abandonados';
$string['enrolledat'] = 'inscrito em';
$string['abandonalert'] = 'Você abandonou curso(s) e não pode se inscrever em novos cursos.';
$string['abandonpunishment'] = 'Dias de punição por abandono';
$string['abandonpunishment'] = 'Dias de suspensão por abandono/reprovação';
$string['abandonpunishment_help'] = 'Número de dias que o aluno não poderá se inscrever em outro curso EAD do ILB depois de ter abandonado um curso.';
$string['coursename'] = 'Nome do curso';
$string['timestart'] = 'Data de início';
$string['timeend'] = 'Data prevista de término';
$string['maxongoingmessage'] = 'Você já está matriculado em {$a} curso(s) sem tutoria, Novas matrículas somente serão aceitas após a conclusão de pelo menos um deles.';

73
lib.php
View File

@ -222,29 +222,23 @@ class enrol_ilbead_plugin extends enrol_plugin {
}
if ($instance->customint7 !== null and $instance->customint7 > 0) {
$ongoing = $this->get_ongoing();
$ongoing = $this->get_ongoing($instance);
if (count($ongoing) >= $instance->customint7) {
// Max ongoing EAD courses reached. New enrol not allowed
$s = get_string('maxongoing', 'enrol_ilbead').'<br/><br/>';
$s .= '<strong>' . get_string('ongoingcourses', 'enrol_ilbead') . ':</strong><br/>';
$error = $OUTPUT->error_text(get_string('maxongoing', 'enrol_ilbead'));
$error .= '<br/><br/><p>'.get_string('maxongoingmessage', 'enrol_ilbead', count($ongoing)).'</p>';
$error .= '<p><strong>'.get_string('ongoingcourses', 'enrol_ilbead').'</strong></p>';
$table = new html_table();
$table->head = array(get_string('coursename', 'enrol_ilbead'), get_string('timestart', 'enrol_ilbead'), get_string('timeend', 'enrol_ilbead'), get_string('abandonpunishment', 'enrol_ilbead'));
$tabledata = array();
foreach ($ongoing as $course) {
$s .= "{$course->fullname}<br/>";
$link = '<a href="'.course_get_url($course).'">'.$course->fullname.'</a>';
$tabledata[] = array($link, userdate($course->timestart), userdate($course->timeend), $course->abandonpunishment);
}
return $OUTPUT->box($s);
}
}
if ($instance->customint8 !== null and $instance->customint8 > 0) {
$abandoned = $this->abandon_courses($instance);
if (count($abandoned) > 0) {
$s = get_string('abandonalert', 'enrol_ilbead').'<br/><br/>';
$s .= '<strong>' . get_string('abandonedcourses', 'enrol_ilbead') . ':</strong><br/>';
$enrolledat = get_string('enrolledat', 'enrol_ilbead');
foreach ($abandoned as $course) {
$date = userdate($course->timecreated);
$s .= "{$course->fullname}, $enrolledat $date<br/>";
}
return $OUTPUT->box($s);
$table->data = $tabledata;
$error .= html_writer::table($table);
$error = $OUTPUT->box($error).$OUTPUT->continue_button("$CFG->wwwroot/index.php");
return $error;
}
}
@ -617,19 +611,20 @@ class enrol_ilbead_plugin extends enrol_plugin {
* @return array ongoing EAD courses
*/
public function get_ongoing() {
public function get_ongoing($instance) {
global $DB;
global $USER;
return $DB->get_records_sql("
select ue.timecreated, c.fullname
$sql = "select c.*, ue.timestart, ue.timeend, e.customint8 as abandonpunishment
from {user_enrolments} ue
join {enrol} e on e.id = ue.enrolid
join {course} c on c.id = e.courseid
left outer join {course_completions} cc on cc.userid = ue.userid and cc.course = e.courseid
where e.enrol = 'ilbead'
and cc.timecompleted is null
and ue.timecreated > ?
and ue.userid = ?", array(time() - (60*86400), $USER->id));
and ue.userid = ?
and ? between ue.timestart and ue.timeend + (e.customint8*86400)";
$time = time();
return $DB->get_records_sql($sql, array($USER->id, time()));
}
/**
@ -644,7 +639,7 @@ class enrol_ilbead_plugin extends enrol_plugin {
return false; // We have not a max ongoing, then its never reached
}
$ongoing = $this->get_ongoing();
$ongoing = $this->get_ongoing($instance);
if (count($ongoing) >= $instance->customint7) {
return true; // Max ongoing reached
@ -652,32 +647,4 @@ class enrol_ilbead_plugin extends enrol_plugin {
return false; // Default max not reached
}
/**
* Abandon courses
* Get all abandoned courses in last 'customint8' days
*
* @param stdClass $instance
* @return array of courses
*/
public function abandon_courses($instance) {
global $DB;
global $USER;
if ($instance->customint8 == null or $instance->customint8 == 0) {
return null; // No abandon punishment
}
return $DB->get_records_sql("
select ue.timecreated, c.fullname
from {user_enrolments} ue
join {enrol} e on e.id = ue.enrolid
join {course} c on c.id = e.courseid
left outer join {course_completions} cc on cc.userid = ue.userid and cc.course = e.courseid
where e.enrol = 'ilbead'
and cc.timecompleted is null
and ue.userid = ?
and ? between ue.timecreated + ? and ue.timecreated + ?", array($USER->id, time(), 60*86400, (60+$instance->customint8)*86400));
}
}

10
locallib.php
View File

@ -63,16 +63,6 @@ class enrol_ilbead_enrol_form extends moodleform {
}
}
if ($plugin->max_ongoing_reached($instance)) {
$ongoing = $plugin->get_ongoing($instance);
$mform->addElement('static', 'notice', '', get_string('maxongoing', 'enrol_ilbead'));
$mform->addElement('static', 'notice', '', get_string('ongoingcourses', 'enrol_ilbead'));
foreach ($ongoing as $course) {
$mform->addElement('static', 'notice', '', $course->fullname);
}
return;
}
if ($instance->password) {
// Change the id of ilbead enrolment key input as there can be multiple ilbead enrolment methods.
$mform->addElement('passwordunmask', 'enrolpassword', get_string('password', 'enrol_ilbead'),

Write Preview
Loading…
Cancel
Save