Clone
 

leonardo canessa <masterbob+github@gmail.com> in Sakai.Git

SAM-3204 Fix up Hotspot Qs in QuestionProgress (#4446)

SAM-3205 Add average score to Samigo pub Noti (#4449)

Add average score to Samigo's publication notification which goes

out to students, the email message. Also add it to the publish page.

SAK-32554 Fix OAuth_consumer_key check (#4438)

Check the Authorization header for oauth_consumer_key if it is not a

parameter.

SAK-32534 - SAK-30153 NPE Fix (#4412)

(cherry picked from commit 4a2ad256893016dcfa900002e7b1969d88399e3f)

SAK-32534 - SAK-30153 NPE Fix (#4412)

SAK-32445 Fix Assignments Grading with ".X" Grades (#4250)

When an assignment was saved with a grade such as ".7" with less

than the number of allowed decimal places (2 is default), the grade was

saved as "0.07"). This changes causes it to be saved as "0.70" by

padding entered scores with trailing 0s as appropriate.

(cherry picked from commit 4ffb8957653d7c3cbf98ad6666742a1982737ace)

SAK-32445 Fix Assignments Grading with ".X" Grades (#4250)

When an assignment was saved with a grade such as ".7" with less

than the number of allowed decimal places (2 is default), the grade was

saved as "0.07"). This changes causes it to be saved as "0.70" by

padding entered scores with trailing 0s as appropriate.

SAK-31068 Add Forums Import As Draft setting (#2368)

* SAK-31068 Add Forums Import As Draft setting

This feature allows the forums tool to have it's own importAsDraft

functionality.

* SAK-31068 Fixup Logic change error

* SAK-31068 Use import.importAsDraft as default also...

changed all instances of retrieving import.importAsDraft from

getString to getBoolean because getting a string is of a boolean

is dumb and needless.

LSNBLDR-790 checklist improvements (biggest is linking) (#4080)

* LSNBLDR-790 Checklist Improvements

* Improve view Other Checklists progress sorting

* Trim whitespace leading and trailing whitespace from checklist titles

and checklist item names. Also error when attempting to save an itiem

with an empty title (or all spaces).

* Checklist items may now link to other items on the same page and

automagically check themself if the item they have linked to has

been completed. If the item linked to is not visible, the checklist

item is blurred on the page via CSS magic (and the title is changed

to "Not available".

All required items may be linked to. Within a checklist, one may only

link to a unique item on the page. Users may not check items which

are linked to another item.

Add a popup and visual indicator that a checklist linked item is linked

to another item.

Linked checklist styling has been improved and the tooltip messaging

now reflects the status of the checkbox (that is a complete linked item

has a separate message from an incomplete item).

When editing a checklist, the linked items are checked to ensure that

the linked item is on the page.

Only able to link to items which are required. If there are no items

required on the page, than linking is hidden.

* Removed unused imports in ShowPageProducer.java

* Javascript removed from the .html page (the rsf template).

* LSNBLDR-790 Checklist Improvements (styling / parsing)

* Remove margin above checklist title in Lessons

* Use JSON to pass checklist item details to backend

Reformatted the checklist item data "complete" string to use JSON format.

Backend was changed to parse the JSON string instead of using String

split to separate using a particular character.

* Hide groups container when no groups

    • -11
    • +69
    /lessonbuilder/tool/src/webapp/css/checklist.css
    • -11
    • +170
    /lessonbuilder/tool/src/webapp/js/checklist.js
    • -0
    • +52
    /lessonbuilder/tool/src/webapp/js/checklistDisplay.js
  1. … 3 more files in changeset.
SAK-32263 Preserve Forum Topic Order on Dupe (#4081)

When a forum was being duplicated via transferCopyEntitiesRefMigrator

the topic List was retrieved in an unsorted order. As such, it was

possible for a topic with a sortOrder > 1 to be selected first and

imported into the new forum. Then when the forum was saved in

MessageForumsForumManagerImpl#saveDiscussionForum

(org.sakaiproject.api.app.messageforums.DiscussionForum, boolean,

boolean, java.lang.String)

the topics would be retrieved using BaseForumImpl#getTopics. This

method would first check to see if the topicSet was sorted by going

through the topics and checking their sort order, starting at 1.

With the topic list being retrieved in an unsorted order, you could

have the first topic inserted to have a sort order > 1. Then when

getTopics was ran, with only one topic in the set (whose sortOrder

is > 1), it would "correct" the sortOrder of this topic.

This change causes the topics to be retireved in a sorted order, thus

the first topic inserted would have a sortOrder of 1 and getTopics would

not rewrite the sortOrder.

SAK-32127 If making the Resources tool invisible, hide root (#3811)

* SAKAI-32127 If making the Resources tool invisible, hide root

Hiding the page the resources tool is on now sets the root collection

to hidden but users still able to access.

This behavior is allowed by setting the sakai.property

poh.resources.hidden.special.hidden

to true. The default for this property is false.

* SAK-32127 elfinder now drops users into root of site

elfinder now drops users into the root of a site, instead of into

the resources folder of the site. Changes to builder.js where made

to be compatible with npm 4.0.5.

* SAK-32127 Add Atachments respects Special Hidden

Add Attachments, from Assignments / Forums, now respects when the

siteCollection (aka the root resources folder of a site) is special

hidden (hidden, but contents accessible). This is done by logging the

PermissionException which occurs and continuing.

* SAK-32127 Minor improvements

Minor improvements as a result of code review.

SAM-3126 Improve the Honor Pledge formatting (#3809)

Make sure the honor pledge is better formatted when the pledge

is long and wraps to multiple lines by ensuring the checkbox is

always to the left and the text is to the right of that checkbox.

SAM-3126 Improve the Honor Pledge formatting (#3809)

Make sure the honor pledge is better formatted when the pledge

is long and wraps to multiple lines by ensuring the checkbox is

always to the left and the text is to the right of that checkbox.

KNL-1494 Copy Root Collection Properties (#3810)

Properties on root collection are persisted on dupe / import / whatnot.

(cherry picked from commit c85af7075b8a3e27e6735ad207e1421f1e182f84)

KNL-1494 Copy Root Collection Properties (#3810)

Properties on root collection are persisted on dupe / import / whatnot.

SAK-31944 Fix Calendar tool Month display name (#3582)

* SAK-31944 Fix Calendar tool Month display name

Previously in the Calendar tool, the month name would be displayed

incorrectly when it was the 31 day of a month. This was resolved

by using the new Java 8 YearMonth object.

Minor cleanup in CalendarUtil.java

* SAK-31944 Add test for month calculations on 31st.

When it’s the 31st of the month the calculated day of the month is shown incorrectly.

SAK-31944 Fix Calendar tool Month display name (#3582)

* SAK-31944 Fix Calendar tool Month display name

Previously in the Calendar tool, the month name would be displayed

incorrectly when it was the 31 day of a month. This was resolved

by using the new Java 8 YearMonth object.

Minor cleanup in CalendarUtil.java

* SAK-31944 Add test for month calculations on 31st.

When it’s the 31st of the month the calculated day of the month is shown incorrectly.

SAM-3075 - Changes to suggested by @master-bob to improve lookups

3631 Improve link passthrough in GradebookNG (#3632)

Within the GradebookNG tool, there is a fixed column which appears only

once scrolled to the right. Clicks on elements within that column (i.e.

student name / the row itself) would not be passed through to the actual

element where the event is processed. This fixes that so that the

clicks are passed through correctly, for example: allowing one to

access the student overview panel when scrolled to the right.

This change also removes the scroll left aspect of the clickthrough.

3651 In GradebookNG prevent erroneous row added (#3652)

Within the GradebookNG tool if one where to turn "Group by Category" on

(when categories where enabled) and then to turn off Categories, if the

user where to scroll right then the fixed header would have an

extraneous row on it. This change causes the row to only be added when

group by category is enabled.

3616-Uncategorized GB Items should not be counted (#3625)

This causes any assignment which is uncategorized (that is a null

category) to not be included in the category grade calculation.

3616-Uncategorized GB Items should not be counted (#3625)

This causes any assignment which is uncategorized (that is a null

category) to not be included in the category grade calculation.

SAK-31820 Fix roster display of roster group (#3466)

Roster groups where being shown regardless of what the permission

was. This was fixed.

SAK-31820 Fix roster display of roster group (#3466)

Roster groups where being shown regardless of what the permission

was. This was fixed.

Update Feedback Tool README (#3482)

* Update Feedback Tool README

Update the feedback tool readme to reflect it's status.

* Update README.md

Added brief bit on icons.

SAK-31711 Remove padding MarkAsRead Icon (#3260)

Removed the padding for the markAsRead icon as it causes the

button to be too small which makes it look odd.

SAK-31711 Remove padding MarkAsRead Icon (#3260)

Removed the padding for the markAsRead icon as it causes the

button to be too small which makes it look odd.

SAM-3007 Samigo, return to the published tab (#3267)

This change makes it so that when you are on the Published

Copies tab and edit an assessment, you are brought back to that

tab.

SAM-3007 Samigo, return to the published tab (#3267)

This change makes it so that when you are on the Published

Copies tab and edit an assessment, you are brought back to that

tab.

SAM-3006 Use publishedSettings values (#3251)

Fix up errornously using assessmentSettings values where

publishedSettings values are needed.