From 77ee8778a841a0bf45e6886b6969b89e1a6207d2 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 3 Oct 2019 11:35:21 +0800
Subject: [PATCH] MDL-66828 mod_forum: Display notification on grade save

Part of MDL-66074
---
 .../amd/build/local/grades/grader.min.js      | Bin 3558 -> 4053 bytes
 .../amd/build/local/grades/grader.min.js.map  | Bin 7742 -> 8357 bytes
 mod/forum/amd/src/local/grades/grader.js      |  20 ++++++++++++++++--
 mod/forum/lang/en/forum.php                   |   1 +
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/mod/forum/amd/build/local/grades/grader.min.js b/mod/forum/amd/build/local/grades/grader.min.js
index b2cfa92eb6d092df06602f3ae18b6b20b79dc357..5ee007bba2c258b4d466ed4d3ef3f1a938a131a1 100644
GIT binary patch
delta 914
zcmYjPL2DC16lR+yX_`jGQYyC8bVWMTj_dBWTG(Zw7r}baLlK0qluc%m-Db0!%ubSO
z68aaE0R<0&{)HYqRK0mn=t+9=Cg{yypa&<}-O|f@vv0n)^L_7qzn9K#y!fOexfW7#
zhlNhW<m4k_RJKvQ8`PK=2Eaj8R6`gMR7VZuzWjbN<AEwPYnFHXN_rq&_COt)DZK3Q
zKU4bp!MF_$C}CY1lv}`o!=XQ^4TnttN9XV+-_1OgeEvT3S8DOM)9X^ezfO-bA#nI<
z?izQpPekQI_NItGvTIVCXL734;afRhqWoQMS&I1Q9GnUP?-b|xzue+g7kQ|OeAGe#
z3Q-$%5O<5~{BeG7gF-|=L-8=Qg#afaW!-SCx)PCqnVxk3T%<#@DGnY#%`ZwG|CN8e
zLKCc}8DR=;3rsi$cleu`N~VJ%{;0IX=L@?MJGKiulGGLK7Wi52$~3ml*<G5&fWSe|
zq2)UFits*$gTCwe1ZZ#&^*vT|0an_S^en6d<dDI^gr;gFRn?5^)~1;Zw+aaVHoJ8c
z>)ABwqI04LD@?T-ii2_5vz_z+6}d`-uzj&=FK9p@H>iV2WW>qo5nK<c@Ix!a`{LAX
z$%rIF*cMEfmcAkWG=2sGd?czc<%AWdO1o_a<d~$4gheJoG(A<K>4Fy1EnJanj?gXJ
zK!qlAY1l81FB1G+W85c`0Lw<ASm<M68$fe38VO?tUEfEQd__f?Zrgmdup(i;Q&?W;
zS*guHJaXs4B9<Lciya-`UGxm)dqr0)|6}o%h(C+6h}k(`n2*lstD#tZfHs9#E3Bxt
z*%L{#&Av#wZ5~>bf0?^C!+@~OGb`em((UVAaEM%(j$q4pZaMLeI{aa&E%o?GY2!ap
CKq!&`

delta 544
zcmYLFPiqrF9A(I#Cc-8JM8pb-igYIZ**4oEm}Q`-2fg(u$Q~xy&1U~(c6WBSwl?uI
zD8GZ>L2uSmrG5tyFWx-pRS?007iX=hm-l-!ya(^SPu*{;&rdJeFe&6X_hU%~j9?57
zxG;I~{awSOBW8`ccl?GtAZ?FMn6;GlJZx6X{<O5PBjx6WlD&uuHlK%o|K{_6vc<VP
zK)3RUg!sPln?!h0?UNaPtuBbfaV^&TW9^2<U$r$7W4FFV65OjtB*oMERif~7ooQut
zWxeA=03k#$0|_xCpm2BP*}as3OT7)>VYUt|GPh?AeLmU9T$x(|pHd%8W`&vrkGJfS
zM?BQbn&~sJEy)8UjhAcbKlflTjF<LAyW-NKcv4z2o@nj;j;Dm<OK(p|H)5b5L*8D+
z&E`Xr9UnG#3CZ!~Lbv0buQQ^KP6+s=v3Z#-7EtizI+Pvl3)K@`cQpDJ{j=x)qA3)3
z*O-z3UmG_yelV_U{AombEYUKrr8=U7ZDtibEhFyhqgy@E$F!{jUf|o-?M6lmW*u^c
eKU%l0<n#c1wye7|e9FbyS_$51C#1kv?e#x6p07Iq

diff --git a/mod/forum/amd/build/local/grades/grader.min.js.map b/mod/forum/amd/build/local/grades/grader.min.js.map
index a79da723e321952e3fe2f93e91565eeae638baf9..ce4ed19e28c8087cf5ddc66992b909bd859960b2 100644
GIT binary patch
delta 931
zcmZ8fTWb?R6lS9pOe3W}8BsYDA-#-^ZLL__N@sU-DZQkzjnYym<L)%scC%AvXPbr)
z`mC=5J}JH^;)5W>XMchZg8#rbe}m}Ers>6fID5`~=ljmtZ}!{V2mIw{Vvy4?^2HDu
zBCfl^NGRlw#Me6wf+G{763*#hVYFX~Q}pP_#EYHxmp=9x>vH+(<c)nB;}Uv~@yfJ`
zER0u?SH!u{ly9#(L7rQvjB_PVL-{pCaKW<B5-!@PYT`oGM4pLp1%)a;)9igqOZk@0
z$E=xHF{`U$%|s7uyi|Uu&z7H}W&z_h6xp~^M7p7{nUjObTZS*klhekMbdxiQJxjhz
z-b;9v{GJ>)rsSXGT*9;EZ2$aSKbCRO3SMy|ov-S=<Z7ukosz9X`KEvIW_Y#(p0rU8
z<0&02d?f$&-yUdcc+cEa(KE{vax67xG-WMi8(Z>oDm&mPAW(1_-#2~pNd8Wxjmb{m
zwU>R{Uj2Y^0WD=bkPv$Qw_%sFI%FKiX;$bP$;@sCz2+(vJE7oSP}Lk&t;fX$lEOQ$
zu7A36oE;tA4qy}tRDh^a*o^{5cr1V@q%H^sAvvT#bjhL0iA%?If6Q4pAe_{pmGfzx
z2BHm|F##J&#bJRU9u4?~zWj-H8$v1yS}SieUeU^$bUIqph=7LY`|v_Z5#Oh7JQNl<
z6%h}hb*iNGvvMN6yg<Tc;B?oVe*!H9oIHXz&zJgCtrrUD{?;%Lq(M9(U#B;Ydz_xp
z!!dN`;czClAbi|?DQnza#xn>qb>{A<G^(pYdo?nmZscqUEqt<kcdSBt!`kW_g;RrJ
Zia2L{<o|6&jk5+&jh$z8ex<iA{{#GAB?JHf

delta 272
zcmZ4LxX)(8Ri?==nKm++L{6T=EY0Y;c?a`yRz}y!37kgqzK)LmI-!n^j;2mJ&W?_r
zFv2-P2P8Fl6=$-ba}`L=*-OV6NV!L5I!&(Tl3~o4JcG-W(S7ncE=wkTr^%e$x=h+m
zlP$RQ7^^0ybK5X!J5OH9ZOfYh((989G|e}qaPoU@F~*|FY&@Qf`I7^9Bp6F3XY$DM
zmx9z}IYk1=OsBw#$y0f37)vK#;&EXNn=H<&uL+XK14;)v8aU-RmAC-8K!qUE*$hm9
rMY5eLH|O(qvTlwLUdlH4kd)VCA!%W@qSTVoqP)pI(jl7zWkOg0e!Wj(

diff --git a/mod/forum/amd/src/local/grades/grader.js b/mod/forum/amd/src/local/grades/grader.js
index 33b2b7528ab..26975091373 100644
--- a/mod/forum/amd/src/local/grades/grader.js
+++ b/mod/forum/amd/src/local/grades/grader.js
@@ -27,6 +27,8 @@ import Selectors from './local/grader/selectors';
 import * as UserPicker from './local/grader/user_picker';
 import {createLayout as createFullScreenWindow} from 'mod_forum/local/layout/fullscreen';
 import getGradingPanelFunctions from './local/grader/gradingpanel';
+import {add as addToast} from 'core/toast';
+import {get_string as getString} from 'core/str';
 
 const templateNames = {
     grader: {
@@ -78,9 +80,23 @@ const registerEventListeners = (graderLayout) => {
     });
 };
 
+/**
+ * Get the function used to save a user grade.
+ *
+ * @param {Element} root The contaienr
+ * @param {Function} setGradeForUser The function that will be called.
+ * @return {Function}
+ */
 const getSaveUserGradeFunction = (root, setGradeForUser) => {
-    return user => {
-        return setGradeForUser(user.id, root.querySelector(Selectors.regions.gradingPanel));
+    return async user => {
+        try {
+            const result = await setGradeForUser(user.id, root.querySelector(Selectors.regions.gradingPanel));
+            addToast(await getString('grades:gradesavedfor', 'mod_forum', user));
+
+            return result;
+        } catch (error) {
+            throw error;
+        }
     };
 };
 
diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php
index 29789c6a45e..8d0a9469386 100644
--- a/mod/forum/lang/en/forum.php
+++ b/mod/forum/lang/en/forum.php
@@ -727,6 +727,7 @@ $string['gradeforwholeforum'] = 'Grade for forum: {$a->str_long_grade}';
 $string['gradeforwholeforumhidden'] = 'Grade for forum hidden';
 $string['gradeitemnameforwholeforum'] = 'Whole forum grade for {$a->name}';
 $string['gradeitemnameforrating'] = 'Rating grade for {$a->name}';
+$string['grades:gradesavedfor'] = 'Grade saved for {$a->fullname}';
 
 // Deprecated since Moodle 3.8.
 $string['cannotdeletediscussioninsinglediscussion'] = 'You cannot delete the first post in a single discussion';
-- 
2.17.1