Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Custom timeframe #10

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Custom timeframe #10

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
791f4fc
added get_courses_by_veranstids_and_time
May 1, 2019
9b46133
single course query is now without time limit
May 1, 2019
dba315a
Merge branch 'master' of github.com:rtschu/his_unification
May 1, 2019
8aff66d
Merge branch 'master' of github.com:rtschu/his_unification into custo…
May 1, 2019
3ce642c
added null handling for pid
May 1, 2019
44498ae
fixed return value
May 1, 2019
32762d4
rewrote is_course_of_teacher ignores time limit now, doesnt load all
May 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 78 additions & 37 deletions lib_his.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function setupHisSoap() {
if (empty($hislsf_soapclient)) {
try {
$hislsf_soapclient = new SoapClient(get_config('local_lsf_unification', 'soapwsdl'));
$result = $hislsf_soapclient->auth(get_config('local_lsf_unification', 'soapuser'),
$result = $hislsf_soapclient->auth(get_config('local_lsf_unification', 'soapuser'),
get_config('local_lsf_unification', 'soappass'));
$his_moodle_url = get_config('local_lsf_unification', 'moodle_url');
$result = $result &&
Expand Down Expand Up @@ -78,7 +78,7 @@ function removeHisLink($veranstid) {
function get_students_stdp_terminids($mtknr) {
global $pgDB;
establish_secondary_DB_connection();
$q = pg_query($pgDB->connection,
$q = pg_query($pgDB->connection,
"SELECT terminid FROM " . HIS_STDP .
" WHERE mtknr = $mtknr and terminid is not null group by terminid order by terminid;");
$return = array();
Expand All @@ -91,14 +91,14 @@ function get_students_stdp_terminids($mtknr) {

/**
* get_teachers_pid returns the pid (personen-id) connected to a specific username
*
*
* @param $username the teachers username
* @return $pid the teachers pid (personen-id)
*/
function get_teachers_pid($username, $checkhis = false) {
global $pgDB;
$emailcheck = $checkhis ? (" OR (login = '" . $username . "')") : "";
$q = pg_query($pgDB->connection,
$q = pg_query($pgDB->connection,
"SELECT pid FROM " . HIS_PERSONAL . " WHERE (zivk = '" . $username . "')" . $emailcheck);
if ($hislsf_teacher = pg_fetch_object($q)) {
return $hislsf_teacher->pid;
Expand All @@ -109,21 +109,20 @@ function get_teachers_pid($username, $checkhis = false) {
return null;
}

function get_courses_by_veranstids($veranstids) {
function get_courses_by_veranstids_and_time ($veranstids, $days) {
global $pgDB;

// if veranstids is empty, no need to make a db request. return empty list
if (empty($veranstids))
if (empty($veranstids)) {
return array();

$veranstids_string = implode(',', $veranstids);
$q = pg_query($pgDB->connection,
"SELECT veranstid, veranstnr, semester, semestertxt, veranstaltungsart, titel, urlveranst
}

$veranstidsstring = implode(',', $veranstids);
$q = pg_query($pgDB->connection,
"SELECT veranstid, veranstnr, semester, semestertxt, veranstaltungsart, titel, urlveranst
FROM " .
HIS_VERANSTALTUNG . " as veranst where veranstid in (" . $veranstids_string .
") AND " . "(CURRENT_DATE - CAST(veranst.zeitstempel AS date)) < " .
get_config('local_lsf_unification', 'max_import_age') .
"order by semester,titel;");
HIS_VERANSTALTUNG . " as veranst where veranstid in (" . $veranstidsstring .
") AND " . "(CURRENT_DATE - CAST(veranst.zeitstempel AS date)) < $days order by semester,titel;");
$result_list = array();
while ($course = pg_fetch_object($q)) {
$result = new stdClass();
Expand All @@ -139,15 +138,54 @@ function get_courses_by_veranstids($veranstids) {
return $result_list;
}

function get_courses_by_veranstids($veranstids) {
global $pgDB;

// if veranstids is empty, no need to make a db request. return empty list
if (empty($veranstids))
return array();

$veranstids_string = implode(',', $veranstids);
$q = pg_query($pgDB->connection,
"SELECT veranstid, veranstnr, semester, semestertxt, veranstaltungsart, titel, urlveranst
FROM " .
HIS_VERANSTALTUNG . " as veranst where veranstid in (" . $veranstids_string .
") AND " . "(CURRENT_DATE - CAST(veranst.zeitstempel AS date)) < " .
get_config('local_lsf_unification', 'max_import_age') .
"order by semester,titel;");
$returnlist = array();
while ($course = pg_fetch_object($q)) {
$returnlist[$course->veranstid] = refinecourse($course);
}
return $returnlist;
}

function refinecourse ($course) {
$result = new stdClass();
$result->veranstid = $course->veranstid;
$result->veranstnr = $course->veranstnr;
$result->semester = $course->semester;
$result->semestertxt = $course->semestertxt;
$result->veranstaltungsart = $course->veranstaltungsart;
$result->titel = $course->titel;
$result->urlveranst = $course->urlveranst;
return $result;
}

function get_course_by_veranstid($veranstid) {
$result = get_courses_by_veranstids(array($veranstid
));
return $result[$veranstid];
global $pgDB;
$q = pg_query($pgDB->connection,
"SELECT veranstid, veranstnr, semester, semestertxt, veranstaltungsart, titel, urlveranst FROM ".
HIS_VERANSTALTUNG . " as veranst where veranstid = $veranstid;");
return refinecourse(pg_fetch_object($q));
}

function get_veranstids_by_teacher($pid) {
if ($pid == null) {
return array();
}
global $pgDB;
$q = pg_query($pgDB->connection,
$q = pg_query($pgDB->connection,
"SELECT veranstid FROM " . HIS_PERSONAL_VERANST .
" WHERE pid = $pid and veranstid is not null group by veranstid order by veranstid;");
$return = array();
Expand All @@ -165,7 +203,7 @@ function username_to_mail($username) {
* creates a list of courses assigned to a teacher
* get_teachers_course_list is a required function for the lsf_unification plugin
*
* @param $username the teachers username
* @param $username String the teachers username
* @param $longinfo level of detail
* @param $checkmail not intended for manual setting, just for recursion
* @return $courselist an array containing objects consisting of veranstid and info
Expand Down Expand Up @@ -200,8 +238,11 @@ function get_teachers_course_list($username, $longinfo = false) {
* @return $is_valid
*/
function is_course_of_teacher($veranstid, $username) {
$courses = get_teachers_course_list($username, false, true);
return !empty($courses[$veranstid]);
global $pgDB;
$pid = get_teachers_pid($username);
$q = pg_query($pgDB->connection,
"SELECT $pid in (SELECT pid FROM learnweb_personal_veranst WHERE veranstid = $veranstid) as isteacher");
return pg_fetch_assoc($q)['isteacher'] == "t";
}

/**
Expand All @@ -216,10 +257,10 @@ function find_origin_category($quellid) {
$origin = $quellid;
do {
$quellid = $origin;
$q = pg_query($pgDB->connection,
$q = pg_query($pgDB->connection,
"SELECT quellid FROM " . HIS_UEBERSCHRIFT . " WHERE ueid = '" . $quellid . "'");
if ($hislsf_title = pg_fetch_object($q)) {
$q2 = pg_query($pgDB->connection,
$q2 = pg_query($pgDB->connection,
"SELECT quellid FROM " . HIS_UEBERSCHRIFT . " WHERE ueid = '" .
($hislsf_title->quellid) . "'");
if ($hislsf_title2 = pg_fetch_object($q2)) {
Expand All @@ -241,7 +282,7 @@ function get_teachers_of_course($veranstid) {
// get sorted (by relevance) pids of teachers
$pidstring = "";
$pids = array();
$q1 = pg_query($pgDB->connection,
$q1 = pg_query($pgDB->connection,
"SELECT DISTINCT pid, sort FROM " . HIS_PERSONAL_VERANST . " WHERE veranstid = " .
$veranstid . " ORDER BY sort ASC");
while ($person = pg_fetch_object($q1)) {
Expand All @@ -252,7 +293,7 @@ function get_teachers_of_course($veranstid) {
return array();
// get personal info
$result = array();
$q2 = pg_query($pgDB->connection,
$q2 = pg_query($pgDB->connection,
"SELECT vorname, nachname, zivk, login, pid FROM " . HIS_PERSONAL . " WHERE pid IN (" .
$pidstring . ")");
while ($person = pg_fetch_object($q2)) {
Expand Down Expand Up @@ -313,7 +354,7 @@ function get_default_shortname($lsf_course, $long = false) {
function get_default_summary($lsf_course) {
global $pgDB;
$summary = '';
$q = pg_query($pgDB->connection,
$q = pg_query($pgDB->connection,
"SELECT kommentar FROM " . HIS_VERANST_KOMMENTAR . " WHERE veranstid = '" .
$lsf_course->veranstid . "'");
while ($sum_object = pg_fetch_object($q)) {
Expand Down Expand Up @@ -350,7 +391,7 @@ function get_default_startdate($lsf_course) {
function course_exists($veranstid) {
global $DB;
if ($DB->record_exists("local_lsf_course", array("veranstid" => ($veranstid))) &&
!($DB->record_exists("local_lsf_course", array("veranstid" => ($veranstid), "mdlid" => 0)) ||
!($DB->record_exists("local_lsf_course", array("veranstid" => ($veranstid), "mdlid" => 0)) ||
$DB->record_exists("local_lsf_course", array("veranstid" => ($veranstid), "mdlid" => 1)))) {
if (!$DB->record_exists("course", array("idnumber" => ($veranstid)))) {
$DB->delete_records("local_lsf_course", array("veranstid" => ($veranstid)));
Expand Down Expand Up @@ -411,7 +452,7 @@ function enrole_teachers($veranstid, $courseid) {
$teacher = $DB->get_record("user", array("username" => $lsf_user->login));
}
if (empty($teacher) ||
!enrol_try_internal_enrol($courseid, $teacher->id,
!enrol_try_internal_enrol($courseid, $teacher->id,
get_config('local_lsf_unification', 'roleid_teacher'))) {
$warnings = $warnings . "\n" .
get_string('warning_cannot_enrol_other', 'local_lsf_unification') . " (" .
Expand Down Expand Up @@ -505,7 +546,7 @@ function get_courses_categories($veranstid, $update_helptables_if_necessary = tr
$helpfuntion3 = function ($array_el) {
return $array_el->mdlid;
};
$q = pg_query($pgDB->connection,
$q = pg_query($pgDB->connection,
"SELECT ueid FROM " . HIS_UEBERSCHRIFT . " WHERE veranstid=" . $veranstid . "");
$choices = array();
$categories = array();
Expand All @@ -522,7 +563,7 @@ function get_courses_categories($veranstid, $update_helptables_if_necessary = tr
"local_lsf_category.mdlid = " . $CFG->prefix .
"course_categories.id) WHERE ueid in (" . $origins . ") ORDER BY sortorder";
if (get_config('local_lsf_unification', 'subcategories')) {
$maincourses = implode(", ",
$maincourses = implode(", ",
array_map($helpfuntion3, $DB->get_records_sql($categories_sql)));
if (empty($maincourses)) {
$maincourses = get_config('local_lsf_unification', 'defaultcategory');
Expand Down Expand Up @@ -560,8 +601,8 @@ function insert_missing_helptable_entries($debugoutput = false, $tryeverything =
$records1_unique[$record1->ueid] = true;
foreach ($records2 as $record2)
$records2_unique[$record2->child][$record2->parent] = ($tryeverything === false);
$q_main = pg_query($pgDB->connection,

$q_main = pg_query($pgDB->connection,
"SELECT ueid, uebergeord, uebergeord, quellid, txt, zeitstempel FROM " . HIS_UEBERSCHRIFT .
" " .
((!empty($tryeverything)) ? ("WHERE ueid >= '" . $tryeverything . "'") : ""));
Expand Down Expand Up @@ -593,10 +634,10 @@ function insert_missing_helptable_entries($debugoutput = false, $tryeverything =
$entry->txt = utf8_encode(delete_bad_chars($hislsf_title->txt));
$DB->insert_record("local_lsf_category", $entry, true);
$records1_unique[$hislsf_title->ueid] = true;
if ($debugoutput)
if ($debugoutput)
echo "x";
} catch(Exception $e) {
if ($debugoutput)
if ($debugoutput)
print("<pre>FEHLER1 ".print_r($e,true)."".print_r($DB->get_last_error(),true));
}
}
Expand All @@ -612,7 +653,7 @@ function insert_missing_helptable_entries($debugoutput = false, $tryeverything =
do {
$ueid = $parent;
$distance++;
$q2 = pg_query($pgDB->connection,
$q2 = pg_query($pgDB->connection,
"SELECT ueid, uebergeord, txt FROM " . HIS_UEBERSCHRIFT . " WHERE ueid = '" .
$ueid . "'");
if (($hislsf_title2 = pg_fetch_object($q2)) && ($hislsf_title2->uebergeord != $ueid)) {
Expand All @@ -637,7 +678,7 @@ function insert_missing_helptable_entries($debugoutput = false, $tryeverything =
$records2_unique[$child][$parent] = true;
}
} while (!empty($parent) && ($ueid != $parent));
$entry = $DB->get_record('local_lsf_category',
$entry = $DB->get_record('local_lsf_category',
array("ueid" => $hislsf_title->ueid
));
$entry->txt2 = utf8_encode($fullname);
Expand Down