Gitlab CSE Unil

Commit 3ca80b06 authored by M. Chardon's avatar M. Chardon
Browse files

maj github -> gitlab

parent df18d261
Pipeline #31 failed with stages
......@@ -172,38 +172,16 @@ if ($action === 'pollconversions') {
if ($refresh) {
$teachers = get_users_by_capability($context, 'assignfeedback/editpdfplus:notify');
$contextb = $assignment->get_context();
$course = $assignment->get_course();
$coursemodule = $assignment->get_course_module();
$modulename = get_string('modulename', 'assign');
$assignmentname = $assignment->get_instance()->name;
$formatparams = array('context' => $contextb->get_course_context());
$flecheHtml = ' → ';
$retourChariot = "\n";
$body = format_string($course->shortname, true, $formatparams)
. $flecheHtml
. $modulename
. $flecheHtml
. format_string($assignmentname, true, $formatparams) . $retourChariot
. $retourChariot . "---------------------------------------------------------------------" . $retourChariot
. "La correction du devoir a été mise à jour. Vous pouvez accéder au document en suivant ce lien : "
. $response->url
. $retourChariot . $retourChariot . "Ceci est un mail automatique.";
$bodyhtml = '<p><font face="sans-serif">'
. getHtmlLink($CFG->wwwroot . '/course/view.php?id=' . $course->id, format_string($course->shortname, true, $formatparams))
. $flecheHtml
. getHtmlLink($CFG->wwwroot . '/mod/assign/index.php?id=' . $course->id, $modulename)
. $flecheHtml
. getHtmlLink($CFG->wwwroot . '/mod/assign/view.php?id=' . $coursemodule->id, format_string($assignmentname, true, $formatparams))
. '</font></p>'
. '<hr/><font face="sans-serif">'
. "<b>Information Moodle</b><br/>"
. "<p>La correction du devoir a été mise à jour. Vous pouvez accéder au document en suivant ce "
. getHtmlLink($response->url, "lien")
. "</p>"
. "<i>Ceci est un mail automatique, merci de ne pas y répondre.</i>";
$a = (object)[
'coursename' => format_string($course->shortname, true),
'modulename' => get_string('modulename', 'assign'),
'assignmentname' => format_string($assignment->get_instance()->name, true),
'url' => $response->url
];
foreach ($teachers as $teacher) {
$res = email_to_user($teacher, $USER, "[Moodle] Mise à jour devoir", $body, $bodyhtml);
$res = email_to_user($teacher, $USER, get_string('assignmentgradedsubject', 'assignfeedback_editpdfplus'), get_string('assignmentgradedbody', 'assignfeedback_editpdfplus', $a));
}
}
......
......@@ -17,8 +17,6 @@
/**
* This file contains the comment class for the assignfeedback_editpdfplus plugin
*
* This class represents a comment box on a page of feedback.
*
* @package assignfeedback_editpdfplus
* @copyright 2016 Université de Lausanne
......
......@@ -82,6 +82,12 @@
<FIELD NAME="cartridge_color" TYPE="char" LENGTH="200" NOTNULL="false" SEQUENCE="false"/>
<FIELD NAME="cartridge_x" TYPE="int" LENGTH="10" NOTNULL="false" SEQUENCE="false"/>
<FIELD NAME="cartridge_y" TYPE="int" LENGTH="10" NOTNULL="false" SEQUENCE="false"/>
<FIELD NAME="configurable" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="1" SEQUENCE="false"/>
<FIELD NAME="configurable_cartridge" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="1" SEQUENCE="false"/>
<FIELD NAME="configurable_cartridge_color" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="1" SEQUENCE="false"/>
<FIELD NAME="configurable_color" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="1" SEQUENCE="false"/>
<FIELD NAME="configurable_texts" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="1" SEQUENCE="false"/>
<FIELD NAME="configurable_question" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="1" SEQUENCE="false"/>
</FIELDS>
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="id"/>
......
......@@ -30,6 +30,7 @@ $string['annotationcolour'] = 'Annotation colour';
$string['black'] = 'Black';
$string['blue'] = 'Blue';
$string['cannotopenpdf'] = 'Cannot open the PDF. The file may be corrupt, or in an unsupported format.';
$string['clear'] = 'Clear';
$string['colourpicker'] = 'Colour picker';
$string['commentcolour'] = 'Comment colour';
$string['comment'] = 'Comments';
......@@ -51,6 +52,7 @@ $string['editpdfplus'] = 'Annotate PDF advanced';
$string['editpdfplus_help'] = 'Annotate students submissions directly in the browser and produce an edited downloadable PDF.';
$string['enabled'] = 'Annotate PDF advanced';
$string['enabled_help'] = 'If enabled, the teacher will be able to create annotated PDF files when marking the assignments. This allows the teacher to add comments, drawing and stamps directly on top of the students work. The annotating is done in the browser and no extra software is required.';
$string['filter'] = 'Filter comments...';
$string['generatefeedback'] = 'Generate feedback PDF';
$string['gotopage'] = 'Go to page';
$string['green'] = 'Green';
......@@ -182,4 +184,11 @@ $string['help_table_titleuse'] = 'Use';
$string['help_highlight'] = 'Highlight an item in the document';
$string['help_verticalline'] = 'Click drag a vertical line in the document';
$string['help_stamp'] = 'Click where to place the stamp';
$string['admin_access_error'] = 'You are not allow to access this page, please contact your teacher or your manager';
\ No newline at end of file
$string['admin_access_error'] = 'You are not allow to access this page, please contact your teacher or your manager';
$string['assignmentgradedsubject'] = '[Moodle] Assignment updated';
$string['assignmentgradedbody'] = '{$a->coursename} → {$a->modulename} → {$a->assignmentname}
The assignment correction has been updated.
You can access the document following this link: {$a->url}';
......@@ -29,6 +29,7 @@ $string['annotationcolour'] = 'Annotation colour';
$string['black'] = 'Black';
$string['blue'] = 'Blue';
$string['cannotopenpdf'] = 'Cannot open the PDF. The file may be corrupt, or in an unsupported format.';
$string['clear'] = 'Clear';
$string['colourpicker'] = 'Colour picker';
$string['commentcolour'] = 'Comment colour';
$string['comment'] = 'Comments';
......@@ -50,6 +51,7 @@ $string['editpdfplus'] = 'Annotation PDF avancé';
$string['editpdfplus_help'] = 'Annotate students submissions directly in the browser and produce an edited downloadable PDF.';
$string['enabled'] = 'Annotation PDF avancé';
$string['enabled_help'] = 'If enabled, the teacher will be able to create annotated PDF files when marking the assignments. This allows the teacher to add comments, drawing and stamps directly on top of the students work. The annotating is done in the browser and no extra software is required.';
$string['filter'] = 'Filter comments...';
$string['generatefeedback'] = 'Générer le feedback PDF';
$string['gotopage'] = 'Aller à la page';
$string['green'] = 'Green';
......
......@@ -186,6 +186,10 @@
width: 0%;
}
.assignfeedback_editpdfplus_widget .helpmessage {
display: none;
}
.assignfeedback_editpdfplus_widget .btn-toolbar {
min-height:50px;
}
......
......@@ -25,10 +25,10 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2018091203;
$plugin->requires = 2018050800; // Requires this Moodle version.
$plugin->version = 2018092002;
$plugin->requires = 2018050800; // Moodle 3.5
$plugin->maturity = MATURITY_STABLE;
$plugin->release = "2.1 (Build: 2018091203)";
$plugin->release = "2.2.2 (Build: 2018092002)";
$plugin->dependencies = array(
'assignfeedback_editpdf' => 2018051400
);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment