Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MERGE][IMP] website_slides: improve inclusion of gamification and ranks #31133

Closed
wants to merge 5 commits into
base: master
from

Conversation

Projects
None yet
3 participants
@tde-banana-odoo
Copy link
Contributor

tde-banana-odoo commented Feb 15, 2019

Purpose of this merge is to improve inclusion of gamification and ranking
in elearning new main pages [1][2]. Ranking and profile information, links
and templates are added.

Some fixes are included in this merge, notably statistics computation, better
slide image fetch and demo data. See sub commits for more details.

Commit linked to task ID 1941250.

@C3POdoo C3POdoo added the RD label Feb 15, 2019

@tde-banana-odoo tde-banana-odoo force-pushed the odoo-dev:master-slides-home-pimp1-tde branch Feb 15, 2019

@robodoo robodoo removed the CI 🤖 label Feb 15, 2019

@tde-banana-odoo tde-banana-odoo force-pushed the odoo-dev:master-slides-home-pimp1-tde branch Feb 15, 2019

@robodoo robodoo added the CI 🤖 label Feb 15, 2019

@tde-banana-odoo tde-banana-odoo force-pushed the odoo-dev:master-slides-home-pimp1-tde branch Feb 15, 2019

@robodoo robodoo removed the CI 🤖 label Feb 15, 2019

@tde-banana-odoo tde-banana-odoo force-pushed the odoo-dev:master-slides-home-pimp1-tde branch 4 times, most recently Feb 15, 2019

@robodoo robodoo added the CI 🤖 label Feb 15, 2019

@tde-banana-odoo tde-banana-odoo force-pushed the odoo-dev:master-slides-home-pimp1-tde branch Feb 15, 2019

@robodoo robodoo removed the CI 🤖 label Feb 15, 2019

tde-banana-odoo added some commits Feb 15, 2019

[FIX] website_slides: fix some statistics and publication issues
This commit fixes various issues introduced by recent commits in slides

 * fix slide type computation: using a dict in a fromkeys makes a shared
   object for all keys. It is better to fix that behavior;
 * correctly display number of course steps in elearning homepage. Currently
   number of steps of a course is simply the length of its one2many;
   holding slides. However this one depends on access rights which give funny
   results like a course with 2 steps for public users and 7 for admin;
   Right computation is: number of published lessons, whatever your access
   rights are. This is already computed as total_slides;
 * people that cannot publish should not be able to unpublish;

Commit linked to task ID 1941250 and PR #31133.
[REF] gamification: clean next rank motivational implementation
Purpose of this commit is to clean motivational capabilities of gamification
ranks[1]. It makes more sense to store a motivational to achieve on next rank
itself. We therefore rename the field and provide nice demo data that will be
used in elearning use of gamification ranks.

Commit linked to task ID 1941250 and PR #31133.

[1] task ID 1922159 (landed at 91ee6ba)
[FIX] website_profile, website_slides: clean user avatar controller a…
…nd add one for slides

Purpose of this commit is to

 * clean user avatar controller and its calls;
 * extract default image computation;
 * add a controller to get slide image even when not having access to the slide
   as all slide name and images are displayed even if not available to the
   current user;

Commit linked to task ID 1941250 and PR #31133.
[IMP] website_profile, website_slides: add user ranking and karma on …
…elearning main pages

Purpose of this commit is to improve karma and gamification inclusion in
elearning [1].

 * remove a border, replaced by a standard hr, in rank template. It allows to
   reuse it easier as we don't necessarily want that border in other templates
   using it;

Commit linked to task ID 1941250 and PR #31133.

[1] task ID 1922159 (landed at 5fa651c)
[FIX] website_slides: fix text / html mismatch in demo data
Slide description is actually a text field, no need to put html tags that
are displayed raw.

Commit linked to task ID 1941250 and PR #31133.

@tde-banana-odoo tde-banana-odoo force-pushed the odoo-dev:master-slides-home-pimp1-tde branch to 8119fa5 Feb 15, 2019

@tde-banana-odoo tde-banana-odoo changed the title Master slides home pimp1 tde [MERGE][IMP] website_slides: improve inclusion of gamification and ranks Feb 15, 2019

@tde-banana-odoo

This comment has been minimized.

Copy link
Contributor Author

tde-banana-odoo commented Feb 15, 2019

@robodoo r+ rebase-merge

@robodoo robodoo added the r+ 👌 label Feb 15, 2019

@robodoo

This comment has been minimized.

Copy link
Contributor

robodoo commented Feb 15, 2019

Merge method set to rebase and merge, using the PR as merge commit message

@robodoo robodoo added the CI 🤖 label Feb 15, 2019

robodoo pushed a commit that referenced this pull request Feb 15, 2019

[FIX] website_slides: fix some statistics and publication issues
This commit fixes various issues introduced by recent commits in slides

 * fix slide type computation: using a dict in a fromkeys makes a shared
   object for all keys. It is better to fix that behavior;
 * correctly display number of course steps in elearning homepage. Currently
   number of steps of a course is simply the length of its one2many;
   holding slides. However this one depends on access rights which give funny
   results like a course with 2 steps for public users and 7 for admin;
   Right computation is: number of published lessons, whatever your access
   rights are. This is already computed as total_slides;
 * people that cannot publish should not be able to unpublish;

Commit linked to task ID 1941250 and PR #31133.

robodoo pushed a commit that referenced this pull request Feb 15, 2019

[REF] gamification: clean next rank motivational implementation
Purpose of this commit is to clean motivational capabilities of gamification
ranks[1]. It makes more sense to store a motivational to achieve on next rank
itself. We therefore rename the field and provide nice demo data that will be
used in elearning use of gamification ranks.

Commit linked to task ID 1941250 and PR #31133.

[1] task ID 1922159 (landed at 91ee6ba)

robodoo pushed a commit that referenced this pull request Feb 15, 2019

[FIX] website_profile, website_slides: clean user avatar controller a…
…nd add one for slides

Purpose of this commit is to

 * clean user avatar controller and its calls;
 * extract default image computation;
 * add a controller to get slide image even when not having access to the slide
   as all slide name and images are displayed even if not available to the
   current user;

Commit linked to task ID 1941250 and PR #31133.

robodoo pushed a commit that referenced this pull request Feb 15, 2019

[IMP] website_profile, website_slides: add user ranking and karma on …
…elearning main pages

Purpose of this commit is to improve karma and gamification inclusion in
elearning [1].

 * remove a border, replaced by a standard hr, in rank template. It allows to
   reuse it easier as we don't necessarily want that border in other templates
   using it;

Commit linked to task ID 1941250 and PR #31133.

[1] task ID 1922159 (landed at 5fa651c)

robodoo pushed a commit that referenced this pull request Feb 15, 2019

[FIX] website_slides: fix text / html mismatch in demo data
Slide description is actually a text field, no need to put html tags that
are displayed raw.

Commit linked to task ID 1941250 and PR #31133.

robodoo added a commit that referenced this pull request Feb 15, 2019

[MERGE][IMP] website_slides: improve inclusion of gamification and ranks
Purpose of this merge is to improve inclusion of gamification and ranking
in elearning new main pages [1][2]. Ranking and profile information, links
and templates are added.

Some fixes are included in this merge, notably statistics computation, better
slide image fetch and demo data. See sub commits for more details.

Commit linked to task ID 1941250.

closes #31133
@robodoo

This comment has been minimized.

Copy link
Contributor

robodoo commented Feb 15, 2019

Merged, thanks!

@robodoo robodoo closed this Feb 15, 2019

@tde-banana-odoo tde-banana-odoo deleted the odoo-dev:master-slides-home-pimp1-tde branch Feb 18, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.