From 0fe417c84eaac8845b0af6988da27c692a5b7c87 Mon Sep 17 00:00:00 2001 From: Muli Dayan Date: Wed, 25 Nov 2015 15:12:35 +0200 Subject: [PATCH 1/9] SUP-5581 for seperate groups, use visible groups logic --- mod/kalvidassign/renderer.php | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/mod/kalvidassign/renderer.php b/mod/kalvidassign/renderer.php index a4f4430f..84bde36d 100644 --- a/mod/kalvidassign/renderer.php +++ b/mod/kalvidassign/renderer.php @@ -781,21 +781,6 @@ public function display_submissions_table($cm, $groupfilter = 0, $filter = 'all' // No groups, do nothing break; case SEPARATEGROUPS: - // If separate groups, but displaying all users then we must display only users - // who are in the same group as the current user - if (0 == $groupfilter) { - $groupscolumn = ', gm.groupid '; - $groupsjoin = ' RIGHT JOIN {groups_members} gm ON gm.userid = u.id RIGHT JOIN {groups} g ON g.id = gm.groupid '; - - $param['courseid'] = $cm->course; - $groupswhere .= ' AND g.courseid = :courseid '; - - $param['groupid'] = $groupfilter; - $groupswhere .= ' AND g.id IN ('.$groupids.') '; - - } - break; - case VISIBLEGROUPS: // if visible groups but displaying a specific group then we must display users within // that group, if displaying all groups then display all users in the course From 09905b13b11aa57182e24e0301b0bfb78cbad8d0 Mon Sep 17 00:00:00 2001 From: Omri Katz Date: Thu, 3 Dec 2015 14:31:15 +0200 Subject: [PATCH 2/9] SUP-6754 showing all users who are enrolled to the course --- mod/kalvidassign/renderer.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/mod/kalvidassign/renderer.php b/mod/kalvidassign/renderer.php index a4f4430f..f97f1c67 100644 --- a/mod/kalvidassign/renderer.php +++ b/mod/kalvidassign/renderer.php @@ -358,6 +358,9 @@ public function col_status($data) { } $buttontext = ''; + // Check if the user submitted the assignment. + $submitted = !is_null($data->timemarked); + if ($data->timemarked > 0) { $class = 's1'; $buttontext = get_string('update'); @@ -366,6 +369,11 @@ public function col_status($data) { $buttontext = get_string('grade'); } + if (!$submitted) { + $class ='s1'; + $buttontext = get_string('nosubmission', 'kalvidassign'); + } + $attr = array('id' => 'up'.$data->id, 'class' => $class); @@ -727,11 +735,11 @@ public function display_submissions_table($cm, $groupfilter = 0, $filter = 'all' // Compare student who have submitted to the assignment with students who are // currently enrolled in the course - $students = kalvidassign_get_assignment_students($cm); - $users = array_intersect(array_keys($users), array_keys($students)); + $students = array_keys(kalvidassign_get_assignment_students($cm)); + $users = array_intersect(array_keys($users), $students); - if (empty($users)) { - echo html_writer::tag('p', get_string('nosubmissionsforgrading', 'kalvidassign')); + if (empty($students)) { + echo html_writer::tag('p', get_string('noenrolledstudents', 'kalvidassign')); return; } @@ -821,7 +829,7 @@ public function display_submissions_table($cm, $groupfilter = 0, $filter = 'all' $columns = user_picture::fields('u').', kvs.id AS submitid, '; $columns .= ' kvs.grade, kvs.submissioncomment, kvs.timemodified, kvs.entry_id, kvs.source, kvs.width, kvs.height, kvs.timemarked, '; $columns .= 'kvs.metadata, 1 AS status, 1 AS selectgrade'.$groupscolumn; - $where .= ' u.deleted = 0 AND u.id IN ('.implode(',', $users).') '.$groupswhere; + $where .= ' u.deleted = 0 AND u.id IN ('.implode(',', $students).') '.$groupswhere; $param['instanceid'] = $cm->instance; $from = "{user} u LEFT JOIN {kalvidassign_submission} kvs ON kvs.userid = u.id AND kvs.vidassignid = :instanceid ".$groupsjoin; From f6af907ea6047ba2bd4daecb79be12fc5c4225e2 Mon Sep 17 00:00:00 2001 From: amirlevykal Date: Mon, 7 Dec 2015 11:34:38 +0200 Subject: [PATCH 3/9] KMS-9948-rename-callbacks --- local/kalturamediagallery/lib.php | 2 +- local/mymedia/lib.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/local/kalturamediagallery/lib.php b/local/kalturamediagallery/lib.php index ad648814..a63e2439 100644 --- a/local/kalturamediagallery/lib.php +++ b/local/kalturamediagallery/lib.php @@ -27,7 +27,7 @@ * @param global_navigation $navigation a global_navigation object * @return void */ -function local_kalturamediagallery_extends_navigation($navigation) { +function local_kalturamediagallery_extend_navigation($navigation) { global $USER, $PAGE, $DB; if (empty($USER->id)) { diff --git a/local/mymedia/lib.php b/local/mymedia/lib.php index cc1e2c5e..516a684d 100644 --- a/local/mymedia/lib.php +++ b/local/mymedia/lib.php @@ -26,7 +26,7 @@ * @param global_navigation $navigation a global_navigation object * @return void */ -function local_mymedia_extends_navigation($navigation) { +function local_mymedia_extend_navigation($navigation) { global $USER, $DB, $PAGE; if (empty($USER->id)) { From ad8812d97afa3bb7179ef03f701f2d4943b1d9d1 Mon Sep 17 00:00:00 2001 From: amirlevykal Date: Mon, 7 Dec 2015 14:53:59 +0200 Subject: [PATCH 4/9] KMS-9930-pr-for-dev-set-video-open --- mod/kalvidres/mod_form.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/kalvidres/mod_form.php b/mod/kalvidres/mod_form.php index c82a6e01..0ee9c791 100644 --- a/mod/kalvidres/mod_form.php +++ b/mod/kalvidres/mod_form.php @@ -129,6 +129,7 @@ public function definition() { $this->add_intro_editor(false); $mform->addElement('header', 'video', get_string('video_hdr', 'kalvidres')); + $mform->setExpanded('video',true); $this->add_video_definition($mform); $this->standard_coursemodule_elements(); From 0965fa7dbedeb1cb6fd38af5f9dff9bd6aaa1807 Mon Sep 17 00:00:00 2001 From: amirlevykal Date: Tue, 8 Dec 2015 15:49:46 +0200 Subject: [PATCH 5/9] KMS-9555-29_DEV --- mod/kalvidassign/pix/icon.gif | Bin 128 -> 1912 bytes mod/kalvidpres/pix/icon.gif | Bin 128 -> 1912 bytes mod/kalvidres/pix/icon.gif | Bin 128 -> 1912 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mod/kalvidassign/pix/icon.gif b/mod/kalvidassign/pix/icon.gif index 550df5db8c43d778c40a1290f1d3a724d0e88133..615c31d68e7c309bb63b6098a4bfbcad17a0bd27 100644 GIT binary patch literal 1912 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 Date: Wed, 9 Dec 2015 17:41:25 +0200 Subject: [PATCH 6/9] KMS-9667-inc-version-DEV_29 --- filter/kaltura/version.php | 4 ++-- lib/editor/atto/plugins/kalturamedia/version.php | 4 ++-- lib/editor/tinymce/plugins/kalturamedia/version.php | 4 ++-- local/kaltura/db/upgrade.php | 6 +++--- local/kaltura/version.php | 2 +- local/kalturamediagallery/version.php | 4 ++-- local/mymedia/version.php | 4 ++-- mod/kalvidassign/version.php | 4 ++-- mod/kalvidpres/version.php | 4 ++-- mod/kalvidres/version.php | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/filter/kaltura/version.php b/filter/kaltura/version.php index 4637d4b5..4720578c 100644 --- a/filter/kaltura/version.php +++ b/filter/kaltura/version.php @@ -24,10 +24,10 @@ */ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2015101809; +$plugin->version = 2015120909; $plugin->release = 'Kaltura release 4.0.08'; $plugin->requires = 2014050800; $plugin->maturity = MATURITY_STABLE; $plugin->dependencies = array( - 'local_kaltura' => 2015101809 + 'local_kaltura' => 2015120909 ); diff --git a/lib/editor/atto/plugins/kalturamedia/version.php b/lib/editor/atto/plugins/kalturamedia/version.php index 4340ff66..96878a1d 100644 --- a/lib/editor/atto/plugins/kalturamedia/version.php +++ b/lib/editor/atto/plugins/kalturamedia/version.php @@ -24,10 +24,10 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2015101809; // The current plugin version (Date: YYYYMMDDXX). +$plugin->version = 2015120909; // The current plugin version (Date: YYYYMMDDXX). $plugin->release = 'Kaltura release 4.0.08'; $plugin->requires = 2014050800; // Requires this Moodle version. $plugin->component = 'atto_kalturamedia'; // Full name of the plugin (used for diagnostics). $plugin->dependencies = array( - 'local_kaltura' => 2015101809 + 'local_kaltura' => 2015120909 ); diff --git a/lib/editor/tinymce/plugins/kalturamedia/version.php b/lib/editor/tinymce/plugins/kalturamedia/version.php index 59534bcd..b229ca84 100644 --- a/lib/editor/tinymce/plugins/kalturamedia/version.php +++ b/lib/editor/tinymce/plugins/kalturamedia/version.php @@ -23,12 +23,12 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2015101809; +$plugin->version = 2015120909; $plugin->release = 'Kaltura release 4.0.08'; // Required Moodle version. $plugin->requires = 2014050800; // Full name of the plugin (used for diagnostics). $plugin->component = 'tinymce_kalturamedia'; $plugin->dependencies = array( - 'local_kaltura' => 2015101809 + 'local_kaltura' => 2015120909 ); diff --git a/local/kaltura/db/upgrade.php b/local/kaltura/db/upgrade.php index c10bb3c1..2b7ae2df 100644 --- a/local/kaltura/db/upgrade.php +++ b/local/kaltura/db/upgrade.php @@ -59,13 +59,13 @@ function xmldb_local_kaltura_upgrade($oldversion) { } // Kaltura savepoint reached. - upgrade_plugin_savepoint(true, 2015101809, 'local', 'kaltura'); + upgrade_plugin_savepoint(true, 2015120909, 'local', 'kaltura'); $savePointDone = true; } - if (!$savePointDone && $oldversion < 2015101809) { + if (!$savePointDone && $oldversion < 2015120909) { // Kaltura savepoint reached. - upgrade_plugin_savepoint(true, 2015101809, 'local', 'kaltura'); + upgrade_plugin_savepoint(true, 2015120909, 'local', 'kaltura'); } return true; } diff --git a/local/kaltura/version.php b/local/kaltura/version.php index 23b069da..5a173d86 100644 --- a/local/kaltura/version.php +++ b/local/kaltura/version.php @@ -25,7 +25,7 @@ die('Direct access to this script is forbidden.'); } -$plugin->version = 2015101809; +$plugin->version = 2015120909; $plugin->component = 'local_kaltura'; $plugin->release = 'Kaltura release 4.0.08'; $plugin->requires = 2014050800; diff --git a/local/kalturamediagallery/version.php b/local/kalturamediagallery/version.php index 1338a6d2..525271fa 100644 --- a/local/kalturamediagallery/version.php +++ b/local/kalturamediagallery/version.php @@ -26,11 +26,11 @@ die('Direct access to this script is forbidden.'); } -$plugin->version = 2015101809; +$plugin->version = 2015120909; $plugin->component = 'local_kalturamediagallery'; $plugin->release = 'Kaltura release 4.0.08'; $plugin->requires = 2014050800; $plugin->maturity = MATURITY_STABLE; $plugin->dependencies = array( - 'local_kaltura' => 2015101809 + 'local_kaltura' => 2015120909 ); diff --git a/local/mymedia/version.php b/local/mymedia/version.php index 9b7d7a83..4bc35cc1 100644 --- a/local/mymedia/version.php +++ b/local/mymedia/version.php @@ -25,11 +25,11 @@ die('Direct access to this script is forbidden.'); } -$plugin->version = 2015101809; +$plugin->version = 2015120909; $plugin->component = 'local_mymedia'; $plugin->release = 'Kaltura release 4.0.08'; $plugin->requires = 2014050800; $plugin->maturity = MATURITY_STABLE; $plugin->dependencies = array( - 'local_kaltura' => 2015101809 + 'local_kaltura' => 2015120909 ); diff --git a/mod/kalvidassign/version.php b/mod/kalvidassign/version.php index dec84ae6..24e6d601 100644 --- a/mod/kalvidassign/version.php +++ b/mod/kalvidassign/version.php @@ -25,12 +25,12 @@ die('Direct access to this script is forbidden.'); } -$module->version = 2015101809; +$module->version = 2015120909; $module->component = 'mod_kalvidassign'; $module->release = 'Kaltura release 4.0.08'; $module->requires = 2014050800; $module->cron = 0; $module->maturity = MATURITY_STABLE; $module->dependencies = array( - 'local_kaltura' => 2015101809, + 'local_kaltura' => 2015120909, ); diff --git a/mod/kalvidpres/version.php b/mod/kalvidpres/version.php index a5836c2e..1d27326e 100644 --- a/mod/kalvidpres/version.php +++ b/mod/kalvidpres/version.php @@ -25,12 +25,12 @@ die('Direct access to this script is forbidden.'); } -$module->version = 2015101809; +$module->version = 2015120909; $module->component = 'mod_kalvidpres'; $module->release = 'Kaltura release 4.0.08'; $module->requires = 2014050800; $module->cron = 0; $module->maturity = MATURITY_STABLE; $module->dependencies = array( - 'local_kaltura' => 2015101809 + 'local_kaltura' => 2015120909 ); diff --git a/mod/kalvidres/version.php b/mod/kalvidres/version.php index 99ae5a10..ff5cb5d9 100644 --- a/mod/kalvidres/version.php +++ b/mod/kalvidres/version.php @@ -25,12 +25,12 @@ die('Direct access to this script is forbidden.'); } -$module->version = 2015101809; +$module->version = 2015120909; $module->component = 'mod_kalvidres'; $module->release = 'Kaltura release 4.0.08'; $module->requires = 2014050800; $module->cron = 0; $module->maturity = MATURITY_STABLE; $module->dependencies = array( - 'local_kaltura' => 2015101809 + 'local_kaltura' => 2015120909 ); From f70aafea2174bf3d78d7d18bc29073028f0a6f5b Mon Sep 17 00:00:00 2001 From: Muli Dayan Date: Mon, 14 Dec 2015 15:14:00 +0200 Subject: [PATCH 7/9] KMS-9555 update icons --- mod/kalvidassign/pix/icon.gif | Bin 1912 -> 572 bytes mod/kalvidpres/pix/icon.gif | Bin 1912 -> 648 bytes mod/kalvidres/pix/icon.gif | Bin 1912 -> 618 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mod/kalvidassign/pix/icon.gif b/mod/kalvidassign/pix/icon.gif index 615c31d68e7c309bb63b6098a4bfbcad17a0bd27..c90fa097a6e37cf6dcf6f5bab665a7aa11583421 100644 GIT binary patch literal 572 zcmZ?wbhEHb6krfwIOfYBAiyakE-xgmAT22%EUhgft1BlbuBm6FZ)Roa5FYBtYUAQ% z;u>e^m6qhmX6v8h5gg+bURD{&=o;7Q8Q)YB%i*8i7m(Q>m^q;{og*k~Qhk=@#4LtM zxtvq-Ip-9!#8xhgt6mvhy(zVRX}^-7w|T(e%-SAWy_k^EoTsBda+X>Ao3laT7}k!Z8Cm^f*oDO2l&$&;o|w-e-<&%^0F zyJdoj@d{%@izUr=R=Qf7v@~tjHrZLLDeh5Ju-{%k!P4sJ(KXYS+KKR=<>z%WWt?u| z;CTJIgKPgx3o`}*_9j_%W^*I6$t+&-9!+}g+HNk=O18qvtUfZ{P5PdC342aFU}$Aw Xt{0dPp|GNf-H|I|ih+uT0E0CEpXon5 literal 1912 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 literal 1912 zcmaJ?X;c$u6b)e!Lqt5r4Hw2yt5C8NvXr2K5P}krB?WO~NCt=|nK&6t5U{wRsDPp( zR?%wJiY!$?i@2c(3R)M`atMkdM+;Q}i;AF#zjX4L3#Hi6(Z+o*#S%V7+Nf#XzKA=r8LA_%CILNJ0OW5{&A zaJ)*o3WdW~1%)eCEm!cB;B0Te%P7DFG%yAMMvYpl7Z`=$fUW>vTaM`Zc7Vh+(|~Rp~Gl zq6I99Pz;iQ2|+y5PbFw{Uu3oV&)0-s7~Kfz=u8^JQqmw$Ci{P=M)L)&$3o$+`TnP{ zK0Hwe(?elBl7K4k#>GyvgwhFoQ5eDyG#o+HgSR+89>EZOJfZ`9!#F^MN~=T+`T?{| zCJ4~#F-WU`1H?iQ=hIXwrGUfr3A}9OI!cd z=D{P}JC@}a)8d;iwuiO2*HPTmCMRbA|5iEz#G-JcX?mDLU|1Z*+iZT+^mgoASKDP{ z4l2mxwi?gzn_07RPgV;LjT%l)AJ6uWeXvDXGAwrDsBv*)IWOR}p!MoYnwt}nPqbhD zYdmWsxINRvngY9>r;s!V(s|xYYYGTLv*}CGn>~3W@4w#Z+oz)}N#PRQH{Cw#X}uWs%&oK3G&W zrd@jC-qCJ!P76VPyX17^qFsk~<`>#T%ZbFwLMh~yQTc0DdpJ1<+OR+Q>EEt5BvrrI z`u&i_jXC3D|L%u9!RDX8+qT#-s`tc_?0~zqR&5UrR^#`8IqCH|nR(0xBfEKl-lost zDzZAZ)!b{^yX;2PZbnyXh1&n_;v}NZ^znO_iyzMhCmroJ?`Qfm-?C#f4tIgAP?fH& z-Y$;{2R4@XC$|;F1e+g+&@Og%Uplq6W>OAaQtEx9$2eQ7>fCFLzwxMope`v~GZ%X% z@jf#ddb->y<@Cs0MOyspuCy#^)AM;-c1QwW(M90}wvH*;Rf!!R{xH2MTW!}&&Xw-I z<@kFui4uM9jdLh(#rgDIQB{KZ11*7Nh;}g&5G}>lvZx>Nh);W@7U@3=*b0-$I%r@>AimMyQx{zYnmtb zfgdD)K8UEj-1eiB;RuPtJNny!1P5DxdC1JL@|HTa7Rx-BEF2cUt+D1LapjCCuI6~7 zZ%r$^IdRR)wx+s-mld5vx2axH&5DMnMSyjF>E`^pVCqC`bl;P)tYY>oiCxk3Ddo_~ zOQV~bvwE(6<5DUuUi>EQW+4CYf&CF4tvwY->WLf6-Y*+|X2IMn^ZHcp)=clMRvQS4 zxoeK+uX_1P&^2*%1Q^1w8v?6y21*Xh)| Date: Mon, 14 Dec 2015 15:22:00 +0200 Subject: [PATCH 8/9] KMS-9555 add png icons --- mod/kalvidassign/pix/icon.png | Bin 0 -> 1020 bytes mod/kalvidpres/pix/icon.png | Bin 0 -> 834 bytes mod/kalvidres/pix/icon.png | Bin 0 -> 1136 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 mod/kalvidassign/pix/icon.png create mode 100644 mod/kalvidpres/pix/icon.png create mode 100644 mod/kalvidres/pix/icon.png diff --git a/mod/kalvidassign/pix/icon.png b/mod/kalvidassign/pix/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a8e0cfb28a649f1cb08fdf0aebccd8ece981859e GIT binary patch literal 1020 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 Date: Sun, 20 Dec 2015 10:51:54 +0200 Subject: [PATCH 9/9] fix-tests-use-base64 --- local/kaltura/tests/locallib_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/local/kaltura/tests/locallib_test.php b/local/kaltura/tests/locallib_test.php index d2bfaa04..94a28ed2 100644 --- a/local/kaltura/tests/locallib_test.php +++ b/local/kaltura/tests/locallib_test.php @@ -1002,7 +1002,7 @@ public function test_local_kaltura_get_kaf_publishing_data_for_non_admin() { $json .= ',{"courseId":"'.$coursetwo->id.'","courseName":"'.$coursetwo->fullname.'","roles":"Learner"}'; $json .= ',{"courseId":"'.$coursefour->id.'","courseName":"'.$coursefour->fullname.'","roles":"Instructor"}]}'; - $this->assertEquals($json, $result); + $this->assertEquals(base64_encode($json), $result); } /** @@ -1046,7 +1046,7 @@ public function test_local_kaltura_get_kaf_publishing_data_for_admin() { $json .= ',{"courseId":"'.$coursethree->id.'","courseName":"'.$coursethree->fullname.'","roles":"urn:lti:sysrole:ims\/lis\/Administrator"}'; $json .= ',{"courseId":"'.$coursefour->id.'","courseName":"'.$coursefour->fullname.'","roles":"urn:lti:sysrole:ims\/lis\/Administrator"}]}'; - $this->assertEquals($json, $result); + $this->assertEquals(base64_encode($json), $result); } /**