Changeset 1702

Timestamp:

03/19/10 19:32:38 (23 months ago)

Author:

sam

Message:

Fin refonte annotSvc.uiservice - correction #416

Location:

trunk/model/sources/academic/gen/_scorm

Files:

• svc/annotSvc.doss/annotSvc.js (modified) (2 diffs)
• widg/annotBtn.doss/annot.js (deleted)
• widg/annotBtn.doss/annotMgr.js (added)
• widg/annotBtn.uiwidget (modified) (1 diff)

trunk/model/sources/academic/gen/_scorm/svc/annotSvc.doss/annotSvc.js

@@ -22 +22 @@
  * Contributor(s):
  * samuel.monsarrat@kelis.fr
+ *
  *
  * Alternatively, the contents of this file may be used under the terms of
@@ -47 +48 @@
 getAnnot(pId)
 
+hasAnnot(pId)
+
 */
 
 //Instanciation du service
 scServices.annotSvc = scOnLoads[scOnLoads.length] = {
-
-isActive : function(){return this._isActive},
-
-_isActive : false,
-onLoad: function(){
-        if(scServices.scorm2k4 && scServices.scorm2k4.isScorm2k4Active()) {
-                this._isActive = true;
-                var vApi = scServices.scorm2k4.getScorm2k4API();
-                var vCount = vApi.GetValue("cmi.comments_from_learner._count");
-                this._annotMap = {};
-                for(var i = 0; i < vCount; i++) this._annotMap[vApi.GetValue("cmi.comments_from_learner."+i+".location")] = i;
-                this.getAnnot = function(pId){
+        _isActive : false,
+        isActive : function(){return this._isActive},
+        onLoad: function(){
+                if(scServices.scorm2k4 && scServices.scorm2k4.isScorm2k4Active()) {
+                        this._isActive = true;
                         var vApi = scServices.scorm2k4.getScorm2k4API();
-                        if(pId in this._annotMap) return vApi.GetValue("cmi.comments_from_learner."+this._annotMap[pId]+".comment");
-                        return null;
-                };
-                this.setAnnot = function(pId, pAnnot){
-                        var vApi = scServices.scorm2k4.getScorm2k4API();
-                        if(pId in this._annotMap) {
-                                vApi.SetValue("cmi.comments_from_learner."+this._annotMap[pId]+".comment", pAnnot);
-                                vApi.Commit("");
-                        } else {
-                                var vIdx = vApi.GetValue("cmi.comments_from_learner._count");
-                                vApi.SetValue("cmi.comments_from_learner."+vIdx+".location", pId);
-                                vApi.SetValue("cmi.comments_from_learner."+vIdx+".comment", pAnnot);
-                                this._annotMap[pId] = vIdx;
-                                vApi.Commit("");
-                        }
-                };
-        } else if(scServices.storage && scServices.storage.isStorageActive()) {
-                this._isActive = true;
-                this.getAnnot = function(pId){
-                        var vItem = scServices.storage.getStorage().getItem(scServices.storage.getRootKey()+"annot/"+pId);
-                        return vItem ? vItem.value : null;
-                };
-                this.setAnnot = function(pId, pAnnot){
-                        scServices.storage.getStorage().setItem(scServices.storage.getRootKey()+"annot/"+pId, pAnnot);
-                };
-        } else {
-                //Pour tests : mettre this._isActive = true;
-                this._isActive = false;
-                this._annot = {};
-                this.getAnnot = function(pId){return this._annot[pId] || "";};
-                this.setAnnot = function(pId, pAnnot){this._annot[pId] = pAnnot;};
-        }
-},
-loadSortKey: "2annotSvc"
+                        var vCount = vApi.GetValue("cmi.comments_from_learner._count");
+                        this._annotMap = {};
+                        for(var i = 0; i < vCount; i++) this._annotMap[vApi.GetValue("cmi.comments_from_learner."+i+".location")] = i;
+                        this.getAnnot = function(pId){
+                                var vApi = scServices.scorm2k4.getScorm2k4API();
+                                if(pId in this._annotMap) return vApi.GetValue("cmi.comments_from_learner."+this._annotMap[pId]+".comment");
+                                return null;
+                        };
+                        this.setAnnot = function(pId, pAnnot){
+                                var vApi = scServices.scorm2k4.getScorm2k4API();
+                                if(pId in this._annotMap) {
+                                        vApi.SetValue("cmi.comments_from_learner."+this._annotMap[pId]+".comment", pAnnot);
+                                        vApi.Commit("");
+                                } else {
+                                        var vIdx = vApi.GetValue("cmi.comments_from_learner._count");
+                                        vApi.SetValue("cmi.comments_from_learner."+vIdx+".location", pId);
+                                        vApi.SetValue("cmi.comments_from_learner."+vIdx+".comment", pAnnot);
+                                        this._annotMap[pId] = vIdx;
+                                        vApi.Commit("");
+                                }
+                        };
+                        this.hasAnnot = function(pId){if (pId in this._annotMap) return true;return false;};
+                } else if(scServices.scorm12 && scServices.scorm12.isScorm12Active()) {
+                        this._isActive = true;
+                        var vApi = scServices.scorm12.getScorm12API();
+                        try {
+                                var vComments = vApi.LMSGetValue("cmi.comments");
+                                this._annot = scServices.dataUtil.deserialiseObjJs(vApi.LMSGetValue("cmi.comments"));
+                        } catch(e){alert("WARNING : an error occured while retreiving student annotations.")}
+                        if (!this._annot) this._annot = {};
+                        this.getAnnot = function(pId){return this._annot[pId] || "";};
+                        this.setAnnot = function(pId, pAnnot){
+                                var vApi = scServices.scorm12.getScorm12API();
+                                this._annot[pId] = pAnnot;
+                                vApi.LMSSetValue("cmi.comments", scServices.dataUtil.serialiseObjJs(this._annot));
+                                vApi.LMSCommit("");
+                        };
+                        this.hasAnnot = function(pId){if (pId in this._annot) return true;return false;};
+                        this.getAnnotLength = function(){return scServices.dataUtil.serialiseObjJs(this._annot).length;};
+                } else if(scServices.storage && scServices.storage.isStorageActive()) {
+                        this._isActive = true;
+                        this.getAnnot = function(pId){
+                                var vItem = scServices.storage.getStorage().getItem(scServices.storage.getRootKey()+"annot/"+pId);
+                                return vItem ? vItem : null;
+                        };
+                        this.setAnnot = function(pId, pAnnot){
+                                scServices.storage.getStorage().setItem(scServices.storage.getRootKey()+"annot/"+pId, pAnnot);
+                        };
+                        this.hasAnnot = function(pId){if (pId in this._annot) return true;return false;};
+                } else {
+                        //Pour tests : mettre this._isActive = true;
+                        this._isActive = false;
+                        this._annot = {};
+                        this.getAnnot = function(pId){return this._annot[pId] || null;};
+                        this.setAnnot = function(pId, pAnnot){this._annot[pId] = pAnnot;};
+                        this.hasAnnot = function(pId){if (pId in this._annot) return true;return false;};
+                }
+        },
+        loadSortKey: "2annotSvc"
 };

trunk/model/sources/academic/gen/_scorm/widg/annotBtn.uiwidget

@@ -8 +8 @@
                 <xsl:value-of select="execute(java:ensureIdOnCurrentResultElt($vDialog))"/>
         &lt;/xsl:overlay&gt;</sm:postXslFragment>
-                <sm:linkScript path="annot.js" pathFrom="localPublishFiles" sortKey="annot"/>
+                <sm:linkScript path="annotMgr.js" pathFrom="localPublishFiles" sortKey="annot"/>
         </sm:fillTemplateBuffers>
         <sm:content>
                 <span xmlns="http://www.w3.org/1999/xhtml" id="annotBtn">
-                        <a href="#" onclick="annot.toggleEditMode(this); return false;">
+                        <a href="#" onclick="annotMgr.toggleEditMode(this); return false;">
                                 <span>;Annotations</span>
                         </a>