Commit 31b76ae8 authored by Claude Bossy's avatar Claude Bossy
Browse files

adds compatibility with postgresql

parent f6df0142

ajax_bridge.php

+7 −7
Original line number Diff line number Diff line
@@ -71,19 +71,19 @@ if ($lp_id && $t_id) { 
    } else if ($lp_id && $hideusers) {



        if ($g_id != 0) {

            $attributes3 = $DB->get_records_sql_menu('SELECT u.id, CONCAT(firstname," ", lastname) as name FROM {user} as u inner join  {groups_members} gm on u.id= gm.userid

                                                   where u.firstname != "Guest User" AND  gm.groupid=?', array($g_id), $limitfrom = 0, $limitnum = 0);

            $attributes3 = $DB->get_records_sql_menu("SELECT u.id, CONCAT(firstname,' ', lastname) as name FROM {user} as u inner join  {groups_members} gm on u.id= gm.userid

                                                   where u.firstname != 'Guest User' AND  gm.groupid=?", array($g_id), $limitfrom = 0, $limitnum = 0);

        } else {

            $attributes3 = $DB->get_records_sql_menu('SELECT id, CONCAT(firstname," ", lastname) as name FROM {user} where firstname != "Guest User"', null, $limitfrom = 0, $limitnum = 0);

            $attributes3 = $DB->get_records_sql_menu("SELECT id, CONCAT(firstname,' ', lastname) as name FROM {user} where firstname != 'Guest User'", null, $limitfrom = 0, $limitnum = 0);

        }





        $attributes4 = $DB->get_records_sql_menu('SELECT u_id as id, (SELECT concat(firstname," ", lastname) FROM {user} WHERE id = u_id) as name FROM {learning_user_learningplan}

                                                   where lp_id = ?', array($lp_id), $limitfrom = 0, $limitnum = 0);

        $attributes4 = $DB->get_records_sql_menu("SELECT u_id as id, (SELECT concat(firstname,' ', lastname) FROM {user} WHERE id = u_id) as name FROM {learning_user_learningplan}

                                                   where lp_id = ?", array($lp_id), $limitfrom = 0, $limitnum = 0);

        $attributes = array_diff($attributes3, $attributes4);

    } else if ($lp_id) {

        $attributes = $DB->get_records_sql_menu('SELECT u.u_id as id, (SELECT  CONCAT(firstname," ", lastname)FROM {user} where username!="guest" AND id = u. u_id) as name FROM

                                                 {learning_user_learningplan} as u where lp_id= ?', array($lp_id), $limitfrom = 0, $limitnum = 0);

        $attributes = $DB->get_records_sql_menu("SELECT u.u_id as id, (SELECT  CONCAT(firstname,' ', lastname)FROM {user} where username!='guest' AND id = u. u_id) as name FROM

                                                 {learning_user_learningplan} as u where lp_id= ?", array($lp_id), $limitfrom = 0, $limitnum = 0);

    }

    $data = "";

    foreach ($attributes as $key => $attrib) {

learning_plan_form.php

+9 −9
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ class assignlerningplan_user_form extends moodleform { 
        $mform->disabledIf('g_id', 'g_selection', 'eq', 1);

        $attributes = $DB->get_records_sql_menu('SELECT id, name FROM {groups}', null, $limitfrom = 0, $limitnum = 0);

        $select = $mform->addElement('select', 'g_id', get_string('department', 'block_learning_plan'), $attributes, null, array(null));

        $attributes = $DB->get_records_sql_menu('SELECT id, CONCAT(firstname," ", lastname)FROM {user} where username!="guest"', array($params = null), $limitfrom = 0, $limitnum = 0);

        $attributes = $DB->get_records_sql_menu("SELECT id, CONCAT(firstname,' ', lastname)FROM {user} where username!='guest'", array($params = null), $limitfrom = 0, $limitnum = 0);

        $select = $mform->addElement('select', 'u_id', get_string('users', 'block_learning_plan'), $attributes, null, array('link' => $CFG->wwwroot . '/user/editadvanced.php?id=-1', 'label' => get_string('addusers', 'block_learning_plan'), $attributes1));

        $select->setMultiple(true);

        $mform->addRule('u_id', get_string('select_user', 'block_learning_plan'), 'required', null, 'client');
@@ -372,9 +372,9 @@ class trainingstatus_form extends moodleform { 
        }

        $mform->addElement('selectwithlink', 'l_id', get_string('learningplan', 'block_learning_plan'), $attributes, null, null);

        if (isset($u_id)) {

            $attributes = $DB->get_records_sql_menu('SELECT id, CONCAT(firstname," ", lastname)FROM {user} where username!="guest" AND id=?', array($u_id), $limitfrom = 0, $limitnum = 0);

            $attributes = $DB->get_records_sql_menu("SELECT id, CONCAT(firstname,' ', lastname)FROM {user} where username!='guest' AND id=?", array($u_id), $limitfrom = 0, $limitnum = 0);

        } else {

            $attributes = $DB->get_records_sql_menu('SELECT id, CONCAT(firstname," ", lastname)FROM {user} where username!="guest"', array($params = null), $limitfrom = 0, $limitnum = 0);

            $attributes = $DB->get_records_sql_menu("SELECT id, CONCAT(firstname,' ', lastname)FROM {user} where username!='guest'", array($params = null), $limitfrom = 0, $limitnum = 0);

        }

        $mform->addElement('selectwithlink', 'u_id', get_string('users', 'block_learning_plan'), $attributes, null, null);

        if (isset($t_id)) {
@@ -438,24 +438,24 @@ class search extends moodleform { 
        $table->width = '100%';

        $table->data = array();

        if ($status == '3') {

            $sql = 'select  t_id, lp_id, lut.status, lut.remarks, `u_id` as id,

            $sql = "select  t_id, lp_id, lut.status, lut.remarks, `u_id` as id,

               (select training_name from  {learning_training} where id =t_id) as training,

               (select learning_plan from   {learning_learningplan} where id =lp_id) as learning_plan,

                (SELECT CONCAT(firstname," ", lastname)FROM {user} where username!="guest" AND id = u_id) as name,

                (SELECT CONCAT(firstname,' ', lastname)FROM {user} where username!='guest' AND id = u_id) as name,

                (select start_date from  {learning_training} where id =t_id)as date1,

                (select end_date from  {learning_training} where id =t_id)as date2

                from {learning_plan_training}

                lpt inner join {learning_user_trainingplan} lut on lut.lpt_id=lpt.id  where lpt.lp_id=?  AND lpt.t_id= ?'; // ORDER BY $orderby';

                lpt inner join {learning_user_trainingplan} lut on lut.lpt_id=lpt.id  where lpt.lp_id=?  AND lpt.t_id= ?"; // ORDER BY $orderby';

        } else {

            $sql = 'select  t_id, lp_id, lut.status, lut.remarks, `u_id` as id,

            $sql = "select  t_id, lp_id, lut.status, lut.remarks, `u_id` as id,

               (select training_name from  {learning_training} where id =t_id)as training,

               (select learning_plan from   {learning_learningplan} where id =lp_id) as learning_plan,

               (SELECT CONCAT(firstname," ", lastname)FROM {user} where username!="guest" AND id = u_id) as name,

               (SELECT CONCAT(firstname,' ', lastname)FROM {user} where username!='guest' AND id = u_id) as name,

               (select start_date from  {learning_training} where id =t_id)as date1,

               (select end_date from  {learning_training} where id =t_id)as date2

               from {learning_plan_training}

               lpt inner join {learning_user_trainingplan} lut

                on lut.lpt_id=lpt.id  where lpt.lp_id=?  AND lpt.t_id= ? AND lut.status = ?';

                on lut.lpt_id=lpt.id  where lpt.lp_id=?  AND lpt.t_id= ? AND lut.status = ?";

        }

        $inc = 0;

        $rs = $DB->get_recordset_sql($sql, array($lp_id, $t_id, $status));

lib.php

+3 −3
Original line number Diff line number Diff line
@@ -133,12 +133,12 @@ function display_list($lp_id, $u_id) { 
    $table->attributes = array('class' => 'display');



    $table->data = array();

    $sql = 'select  t_id, (select type_id from  {learning_training} where id =t_id) as type_id, lp_id, lut.status, lut.remarks, `u_id` as id,(select training_name from  {learning_training} where id =t_id)

    $sql = "select  t_id, (select type_id from  {learning_training} where id =t_id) as type_id, lp_id, lut.status, lut.remarks, `u_id` as id,(select training_name from  {learning_training} where id =t_id)

            as training, (select url from {learning_training} where id =t_id) as url, (select learning_plan from   {learning_learningplan} where id =lp_id) as learning_plan, (SELECT

            CONCAT(firstname," ", lastname)FROM {user} where username!="guest" AND id = u_id) as name,(select

            CONCAT(firstname,' ', lastname)FROM {user} where username!='guest' AND id = u_id) as name,(select

            start_date from  {learning_training} where id =t_id)as date1,(select end_date from  {learning_training}

            where id =t_id)as date2 from {learning_plan_training} lpt inner join {learning_user_trainingplan} lut

            on lut.lpt_id=lpt.id  where lpt.lp_id=? AND lut.u_id=?'; //ORDER BY $orderby';

            on lut.lpt_id=lpt.id  where lpt.lp_id=? AND lut.u_id=?"; //ORDER BY $orderby';

    $inc = 0;

    $rs = $DB->get_recordset_sql($sql, array($lp_id, $u_id));

    foreach ($rs as $log) {