Gitlab CSE Unil
Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
M. Chardon
moodle-assignfeedback_editpdfplus
Commits
3331e78b
Commit
3331e78b
authored
Jul 23, 2018
by
M. Chardon
Browse files
patch maj moodle3.5-editpdf
parent
5be8c22e
Changes
5
Hide whitespace changes
Inline
Side-by-side
amd/src/annotation.js
View file @
3331e78b
...
...
@@ -40,6 +40,7 @@ define(['jquery', './global'],
// next value instance ID.
return
(
++
instanceCount
);
};
// I return an initialized object.
/**
* Annotation class.
...
...
classes/task/convert_submissions.php
View file @
3331e78b
...
...
@@ -94,19 +94,18 @@ class convert_submissions extends scheduled_task {
}
mtrace
(
'Convert '
.
count
(
$users
)
.
' submission attempt(s) for assignment '
.
$assignmentid
);
$keepinqueue
=
false
;
foreach
(
$users
as
$userid
)
{
$combineddocument
=
document_services
::
get_combined_pdf_for_attempt
(
$assignment
,
$userid
,
$attemptnumber
);
switch
(
$combineddocument
->
get_status
())
{
case
combined_document
::
STATUS_READY
:
case
combined_document
::
STATUS_PENDING_INPUT
:
// The document has not been converted yet or is somehow still ready.
$keepinqueue
=
true
;
continue
;
}
foreach
(
$users
as
$userid
)
{
try
{
$combineddocument
=
document_services
::
get_combined_pdf_for_attempt
(
$assignment
,
$userid
,
$attemptnumber
);
$status
=
$combineddocument
->
get_status
();
switch
(
$combineddocument
->
get_status
())
{
case
combined_document
::
STATUS_READY
:
case
combined_document
::
STATUS_PENDING_INPUT
:
// The document has not been converted yet or is somehow still ready.
continue
;
}
document_services
::
get_page_images_for_attempt
(
$assignment
,
$userid
,
$attemptnumber
,
false
);
...
...
@@ -115,14 +114,11 @@ class convert_submissions extends scheduled_task {
);
}
catch
(
\
moodle_exception
$e
)
{
mtrace
(
'Conversion failed with error:'
.
$e
->
errorcode
);
$keepinqueue
=
true
;
}
}
if
(
!
$keepinqueue
)
{
// Remove from queue unless requested not to.
$DB
->
delete_records
(
'assignfeedback_editpp_queue'
,
array
(
'id'
=>
$record
->
id
));
}
// Remove from queue.
$DB
->
delete_records
(
'assignfeedback_editpp_queue'
,
array
(
'id'
=>
$record
->
id
));
}
}
...
...
styles.css
View file @
3331e78b
...
...
@@ -229,8 +229,8 @@
.moodle-dialogue-base
.moodle-dialogue.assignfeedback_editpdfplus_dropdown
.moodle-dialogue-bd
{
padding
:
0
;
}
.assignfeedback_editpdfplus_dropdown
.moodle-dialogue-hd
,
.assignfeedback_editpdfplus_dropdown
.moodle-dialogue-ft
{
.moodle-dialogue-base
.assignfeedback_editpdfplus_dropdown
.moodle-dialogue-wrap
.moodle-dialogue-hd
,
.moodle-dialogue-base
.assignfeedback_editpdfplus_dropdown
.moodle-dialogue-wrap
.moodle-dialogue-ft
{
display
:
none
;
}
.assignfeedback_editpdfplus_menu
li
hr
{
...
...
tests/editpdfplus_test.php
View file @
3331e78b
...
...
@@ -31,7 +31,7 @@ use \assignfeedback_editpdfplus\pdf;
use
\
assignfeedback_editpdfplus\bdd\annotation
;
global
$CFG
;
require_once
(
$CFG
->
dirroot
.
'/mod/assign/tests/
base_test
.php'
);
require_once
(
$CFG
->
dirroot
.
'/mod/assign/tests/
generator
.php'
);
/**
* Unit tests for assignfeedback_editpdfplus\comments_quick_list
...
...
version.php
View file @
3331e78b
...
...
@@ -24,7 +24,7 @@
defined
(
'MOODLE_INTERNAL'
)
||
die
();
$plugin
->
version
=
20180
601
00
;
$plugin
->
version
=
20180
723
00
;
$plugin
->
requires
=
2018050800
;
// Requires this Moodle version.
$plugin
->
maturity
=
MATURITY_STABLE
;
$plugin
->
release
=
"2.0 (Build: 2017100400)"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment