- isidorus-cvs@common-lisp.net - mailman3.common-lisp.net

[isidorus-cvs] r44 - in trunk/src: ajax/javascripts json
by Lukas Giessmann 16 Jun '09

16 Jun '09

Author: lgiessmann Date: Tue Jun 16 08:17:10 2009 New Revision: 44 Log: ajax-client: a fragment commit without validation is implemented; json-importer: to import a topic or a topicStub it is necessary to define a psi for this element - this is difference between the xtm-importer $there must be one of the elements psi, itemidentity, subjectlocator defined$, because all topics are referenced via psis and not topicid\'s Modified: trunk/src/ajax/javascripts/create.js trunk/src/ajax/javascripts/datamodel.js trunk/src/ajax/javascripts/requests.js trunk/src/json/json_importer.lisp Modified: trunk/src/ajax/javascripts/create.js ============================================================================== --- trunk/src/ajax/javascripts/create.js (original) +++ trunk/src/ajax/javascripts/create.js Tue Jun 16 08:17:10 2009 @@ -36,6 +36,11 @@ items[i].remove(); } + items = $$("li." + CLASSES.tmIdFrame()); + for(var i = 0; i !== items.length; ++i){ + items[i].remove(); + } + items = $$("li." + CLASSES.commitButton()); for(var i = 0; i !== items.length; ++i){ items[i].remove(); @@ -49,10 +54,17 @@ var liT = new Element("li", {"class" : CLASSES.topicFrame()}).update(topic.getFrame()); context.insert({"after" : liT}); - addTopicAsPlayer((constraints ? constraints.associationsConstraints : null), topic.getContent().instanceOfs); - var associations = new AssociationContainerC(null, (constraints ? constraints.associationsConstraints : null)); - var liA = new Element("li", {"class" : CLASSES.associationContainer()}).update(associations.getFrame()); - liT.insert({"after" : liA}); + var liA = null; + var associations = null; + if(constraints && constraints.associationsConstraints && constraints.associationsConstraints.length !== 0){ + addTopicAsPlayer((constraints ? constraints.associationsConstraints : null), topic.getContent().instanceOfs); + associations = new AssociationContainerC(null, (constraints ? constraints.associationsConstraints : null)); + liA = new Element("li", {"class" : CLASSES.associationContainer()}).update(associations.getFrame()); + liT.insert({"after" : liA}); + } + else { + liA = liT; + } var tmId = new tmIdC(null); var liTm = new Element("li", {"class" : CLASSES.tmIdFrame()}).update(tmId.getFrame()); @@ -60,10 +72,12 @@ var commitButton = new Element("input", {"type" : "button", "value" : "commit fragment", "style" : "float: right; margin-top: -10px;"}) commitButton.observe("click", function(event){ - try{ var tPsis = topic.getContent().subjectIdentifiers; - var referencedTopics = topic.getReferencedTopics().concat(associations.getReferencedTopics()).without(CURRENT_TOPIC).uniq(); - + var referencedTopics = topic.getReferencedTopics(); + if(associations){ + referencedTopics = referencedTopics.concat(associations.getReferencedTopics()).without(CURRENT_TOPIC).uniq(); + } + function onSuccessHandler(topicStubs){ var tsStr = "null"; if(topicStubs && topicStubs.length !== 0){ @@ -76,19 +90,18 @@ } var jTopic = "\"topic\":" + topic.toJSON(); var jTopicStubs = "\"topicStubs\":" + tsStr; - var jAssociations = "\"associations\":" + associations.toJSON().gsub(CURRENT_TOPIC_ESCAPED, tPsis) + var jAssociations = "\"associations\":" + (associations ? associations.toJSON().gsub(CURRENT_TOPIC_ESCAPED, tPsis) : "null"); var jTmId = "\"tmIds\":" + tmId.toJSON(); var json = "{" + jTopic + "," + jTopicStubs + "," + jAssociations + "," + jTmId + "}"; - alert(json); + commitFragment(json, function(xhr){ alert("The fragment was committed succesfully!"); }, null); } - + function onErrorHandler(){ - // --- currently there is not neede a special handling for errors + // --- currently there is not needed a special handling for errors // --- occurred during this operation } - + getTopicStubs(referencedTopics, onSuccessHandler, onErrorHandler); - }catch(err){ alert("test: " + err); } }); var liCB = new Element("li", {"class" : CLASSES.commitButton()}); liCB.update(commitButton); Modified: trunk/src/ajax/javascripts/datamodel.js ============================================================================== --- trunk/src/ajax/javascripts/datamodel.js (original) +++ trunk/src/ajax/javascripts/datamodel.js Tue Jun 16 08:17:10 2009 @@ -650,6 +650,9 @@ catch(err){ return new Array(); } + + for(var i = 0; i !== values.length; ++i) + values[i] = new Array(values[i]); return values; }, "disable" : function(){ @@ -1486,7 +1489,7 @@ var scopes = names[i].scopes; if(scopes){ for(var j = 0; j !== scopes.length; ++j){ - if(referencedTopics.indexOf(scopes[j]) === -1) referencedTopics.push(scopes[j]); + if(referencedTopics.indexOf(scopes[j][0]) === -1) referencedTopics.push(scopes[j][0]); } } } @@ -1502,7 +1505,7 @@ var scopes = occurrences[i].scopes; if(scopes){ for(var j = 0; j !== scopes.length; ++j){ - if(referencedTopics.indexOf(scopes[j]) === -1) referencedTopics.push(scopes[j]); + if(referencedTopics.indexOf(scopes[j][0]) === -1) referencedTopics.push(scopes[j][0]); } } } @@ -2461,7 +2464,7 @@ var scopes = associations[i].scopes; if(scopes){ for(var j = 0; j !== scopes.length; ++j){ - if(referencedTopics.indexOf(scopes[j]) === -1) referencedTopics.push(scopes[j]); + if(referencedTopics.indexOf(scopes[j][0]) === -1) referencedTopics.push(scopes[j][0]); } } var roles = associations[i].roles; Modified: trunk/src/ajax/javascripts/requests.js ============================================================================== --- trunk/src/ajax/javascripts/requests.js (original) +++ trunk/src/ajax/javascripts/requests.js Tue Jun 16 08:17:10 2009 @@ -89,7 +89,7 @@ function checkRequests(){ var delta = 100; neededTime += delta; - if(delta > maxTimeout){ + if(delta > maxTimeout && psis && psis.length !== 0){ alert("From getTopicStubs(): Please check your network-connection - the request timed out!!!"); onFailureHandler(); return; @@ -105,4 +105,22 @@ catch(err){ alert("From getTopicStubs(): Could not request topicStubs information for: " + psis + "\n\n" + err); } +} + + +function commitFragment(json, onSuccessHandler, onFailureHandler) +{ + if(!json || !onSuccessHandler) throw "From commitFragment(): json and onSuccessHandler must be set!"; + try{ + var onFailure = onFailureHandler ? onFailureHandler : defaultFailureHandler; + + new Ajax.Request(COMMIT_URL, { + "method" : "post", + "postBody" : json, + "onSuccess" : onSuccessHandler, + "onFailure" : onFailure}); + } + catch(err){ + alert("From commitFragment(): " + err); + } } \ No newline at end of file Modified: trunk/src/json/json_importer.lisp ============================================================================== --- trunk/src/json/json_importer.lisp (original) +++ trunk/src/json/json_importer.lisp Tue Jun 16 08:17:10 2009 @@ -391,9 +391,8 @@ (t (error "json-importer:get-topicStub-values-from-json-string: bad item-specifier found in json-list")))) - (unless (or itemIdentities subjectLocators subjectIdentifiers) - (error "json-importer:get-topicStub-values-from-json-string: one of the elements - itemIdentity, sbjectLocator or subjectIdentifier must be set")) + (unless subjectIdentifiers + (error "json-importer:get-topicStub-values-from-json-string: the element subjectIdentifiers mus be set!")) (unless id (error "json-importer:get-topic-valuesStub-from-json-string: the element id must be set")) (list :id id @@ -433,9 +432,8 @@ (t (error "json-importer:get-topic-values-from-json-string: bad item-specifier found in json-list ~a" (car j-elem))))) - (unless (or itemIdentities subjectLocators subjectIdentifiers) - (error "json-importer:get-topic-values-from-json-string: one of the elements - itemIdentity, sbjectLocator or subjectIdentifier must be set")) + (unless subjectIdentifiers + (error "json-importer:get-topic-values-from-json-string: the element subjectIdentifiers must be set!")) (unless id (error "json-importer:get-topic-values-from-json-string: the element id must be set")) (let ((names-list (map 'list #'get-name-values-from-json-list names))

1 0

[isidorus-cvs] r43 - trunk/src/ajax/javascripts
by Lukas Giessmann 16 Jun '09

16 Jun '09

Author: lgiessmann Date: Tue Jun 16 06:52:20 2009 New Revision: 43 Log: ajax-client: finalized the "toJSON()" methods of all needed classes - so it is possible to create a json-string of the users objects Modified: trunk/src/ajax/javascripts/constants.js trunk/src/ajax/javascripts/create.js trunk/src/ajax/javascripts/datamodel.js Modified: trunk/src/ajax/javascripts/constants.js ============================================================================== --- trunk/src/ajax/javascripts/constants.js (original) +++ trunk/src/ajax/javascripts/constants.js Tue Jun 16 06:52:20 2009 @@ -76,6 +76,7 @@ "__spanDeselect__" : "deselect", "__divFog__" : "fog", "__inputCommitButton__" : "commitButton", + "__divTmIdFrame__" : "tmIdFrame", "page" : function(){ return this.__divPage__; }, "subPage" : function(){ return this.__divSubPage__; }, @@ -115,5 +116,6 @@ "playerFrame" : function(){ return this.__divPlayerFrame__; }, "deselect" : function(){ return this.__spanDeselect__; }, "fog" : function(){ return this.__divFog__; }, - "commitButton" : function(){ return this.__inputCommitButton__; } + "commitButton" : function(){ return this.__inputCommitButton__; }, + "tmIdFrame" : function(){ return this.__divTmIdFrame__; } }; \ No newline at end of file Modified: trunk/src/ajax/javascripts/create.js ============================================================================== --- trunk/src/ajax/javascripts/create.js (original) +++ trunk/src/ajax/javascripts/create.js Tue Jun 16 06:52:20 2009 @@ -50,10 +50,14 @@ context.insert({"after" : liT}); addTopicAsPlayer((constraints ? constraints.associationsConstraints : null), topic.getContent().instanceOfs); - var associations = new AssociationContainerC(null, (constraints ? constraints.associationsConstraints : null), topic); + var associations = new AssociationContainerC(null, (constraints ? constraints.associationsConstraints : null)); var liA = new Element("li", {"class" : CLASSES.associationContainer()}).update(associations.getFrame()); liT.insert({"after" : liA}); + var tmId = new tmIdC(null); + var liTm = new Element("li", {"class" : CLASSES.tmIdFrame()}).update(tmId.getFrame()); + liA.insert({"after" : liTm}); + var commitButton = new Element("input", {"type" : "button", "value" : "commit fragment", "style" : "float: right; margin-top: -10px;"}) commitButton.observe("click", function(event){ try{ @@ -61,16 +65,20 @@ var referencedTopics = topic.getReferencedTopics().concat(associations.getReferencedTopics()).without(CURRENT_TOPIC).uniq(); function onSuccessHandler(topicStubs){ - var str = "null"; + var tsStr = "null"; if(topicStubs && topicStubs.length !== 0){ - str = "["; + tsStr = "["; for(var i = 0; i !== topicStubs.length; ++i){ - str += topicStubs[i]; - if(i !== topicStubs.length - 1) str += ","; + tsStr += topicStubs[i]; + if(i !== topicStubs.length - 1) tsStr += ","; } - str += "]"; + tsStr += "]"; } - var json = "{\"topic\":" + topic.toJSON() + ",\"topicStubs\":" + str + ",\"associations\":" + associations.toJSON().gsub(CURRENT_TOPIC_ESCAPED, tPsis) + ",\"tmIds\":" + "[\"myTM\"]}"; + var jTopic = "\"topic\":" + topic.toJSON(); + var jTopicStubs = "\"topicStubs\":" + tsStr; + var jAssociations = "\"associations\":" + associations.toJSON().gsub(CURRENT_TOPIC_ESCAPED, tPsis) + var jTmId = "\"tmIds\":" + tmId.toJSON(); + var json = "{" + jTopic + "," + jTopicStubs + "," + jAssociations + "," + jTmId + "}"; alert(json); } @@ -84,7 +92,7 @@ }); var liCB = new Element("li", {"class" : CLASSES.commitButton()}); liCB.update(commitButton); - liA.insert({"after" : liCB}); + liTm.insert({"after" : liCB}); } Modified: trunk/src/ajax/javascripts/datamodel.js ============================================================================== --- trunk/src/ajax/javascripts/datamodel.js (original) +++ trunk/src/ajax/javascripts/datamodel.js Tue Jun 16 06:52:20 2009 @@ -2382,10 +2382,9 @@ // --- contains all fragment's associations depending on the main topic -var AssociationContainerC = Class.create(ContainerC, {"initialize" : function($super, contents, constraints, mainTopic){ +var AssociationContainerC = Class.create(ContainerC, {"initialize" : function($super, contents, constraints){ $super(); this.__minimized__ = false; - this.__mainTopic__ = mainTopic; try{ this.__frame__ .writeAttribute({"class" : CLASSES.associationContainer()}); this.__table__ = new Element("table", {"class" : CLASSES.associationContainer()}); @@ -2480,45 +2479,53 @@ }}); +// --- Representation of a topic map if frame. +var tmIdC = Class.create(ContainerC, {"initialize" : function($super, contents){ + $super(); + try{ + this.__frame__.writeAttribute({"class" : CLASSES.itemIdentityFrame()}); + this.__container__ = new Object(); + this.__frame__.writeAttribute({"class" : CLASSES.tmIdFrame()}); + this.__table__ = new Element("table", {"class" : CLASSES.tmIdFrame()}); + this.__frame__.insert({"top" : this.__table__}); + this.__caption__ = new Element("caption", {"class" : CLASSES.clickable()}).update("Topic Map ID"); + this.__table__.update(this.__caption__); + var value = contents && contents.length !== 0 ? contents[0] : ""; + this.__contentrow__ = new Element("input", {"type" : "text", "value" : value}); + this.__tr__ = new Element("tr", {"class" : CLASSES.tmIdFrame()}); + var td =new Element("td", {"class" : CLASSES.content()}); + this.__tr__.update(td); + td.update(this.__contentrow__); + this.__table__.insert({"bottom" : this.__tr__}); + + this.__minimized__ = false; + function setMinimizeHandler(myself){ + myself.__caption__.observe("click", function(event){ + myself.minimize(); + }); + } + setMinimizeHandler(this); + } + catch(err){ + alert("From tmIdC(): " + err); + } + }, + "getContent" : function(){ + if(this.__contentrow__.value.strip().length === 0) return null; + return new Array(this.__contentrow__.value.strip()); + }, + "toJSON" : function(){ + return (this.getContent() === null ? "null" : this.getContent().toJSON()); + }, + "isValid" : function(){ + return this.getContent() !== null; + }, + "minimize": function(){ + if(this.__minimized__ === false) this.__tr__.hide(); + else this.__tr__.show(); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + this.__minimized__ = !this.__minimized__; + }}); // --- A handler for the dblclick-event. So a frame can be disabled or enabled.

1 0

[isidorus-cvs] r42 - trunk/src/ajax/javascripts
by Lukas Giessmann 16 Jun '09

16 Jun '09

Author: lgiessmann Date: Tue Jun 16 06:04:53 2009 New Revision: 42 Log: ajax-client: by commiting a fragment, there will be requested all needed topicStubs for a valid fragment by the ajax as a "background process", so the user does not need to care about the referenced topicStubs Modified: trunk/src/ajax/javascripts/constants.js trunk/src/ajax/javascripts/create.js trunk/src/ajax/javascripts/datamodel.js trunk/src/ajax/javascripts/requests.js Modified: trunk/src/ajax/javascripts/constants.js ============================================================================== --- trunk/src/ajax/javascripts/constants.js (original) +++ trunk/src/ajax/javascripts/constants.js Tue Jun 16 06:04:53 2009 @@ -31,6 +31,7 @@ var ANY_URI = "http://www.w3.org/2001/XMLSchema#anyURI"; var STRING = "http://www.w3.org/2001/XMLSchema#string"; var CURRENT_TOPIC = "**current-topic**"; +var CURRENT_TOPIC_ESCAPED = "\\*\\*current-topic\\*\\*"; // --- Contains most css classes used in this project // --- There should be called only the function to be sure to don't override Modified: trunk/src/ajax/javascripts/create.js ============================================================================== --- trunk/src/ajax/javascripts/create.js (original) +++ trunk/src/ajax/javascripts/create.js Tue Jun 16 06:04:53 2009 @@ -56,7 +56,31 @@ var commitButton = new Element("input", {"type" : "button", "value" : "commit fragment", "style" : "float: right; margin-top: -10px;"}) commitButton.observe("click", function(event){ - alert("commit fragment"); + try{ + var tPsis = topic.getContent().subjectIdentifiers; + var referencedTopics = topic.getReferencedTopics().concat(associations.getReferencedTopics()).without(CURRENT_TOPIC).uniq(); + + function onSuccessHandler(topicStubs){ + var str = "null"; + if(topicStubs && topicStubs.length !== 0){ + str = "["; + for(var i = 0; i !== topicStubs.length; ++i){ + str += topicStubs[i]; + if(i !== topicStubs.length - 1) str += ","; + } + str += "]"; + } + var json = "{\"topic\":" + topic.toJSON() + ",\"topicStubs\":" + str + ",\"associations\":" + associations.toJSON().gsub(CURRENT_TOPIC_ESCAPED, tPsis) + ",\"tmIds\":" + "[\"myTM\"]}"; + alert(json); + } + + function onErrorHandler(){ + // --- currently there is not neede a special handling for errors + // --- occurred during this operation + } + + getTopicStubs(referencedTopics, onSuccessHandler, onErrorHandler); + }catch(err){ alert("test: " + err); } }); var liCB = new Element("li", {"class" : CLASSES.commitButton()}); liCB.update(commitButton); Modified: trunk/src/ajax/javascripts/datamodel.js ============================================================================== --- trunk/src/ajax/javascripts/datamodel.js (original) +++ trunk/src/ajax/javascripts/datamodel.js Tue Jun 16 06:04:53 2009 @@ -1018,7 +1018,9 @@ }, "getContent" : function(){ if(this.isUsed() === false) return null; + var type = this.__type__.__frames__[0].getContent(); return {"itemIdentities" : this.__itemIdentity__.getContent(true, true), + "type" : type ? new Array(type) : null, "scopes" : this.__scope__.getContent(), "value" : this.__value__.__frames__[0].getContent(), "variants" : this.__variants__.getContent()}; @@ -1470,6 +1472,42 @@ }, "hasPsi" : function(){ return this.__subjectIdentifier__.getContent(true, true).length !== 0; + }, + "getReferencedTopics" : function(){ + var referencedTopics = new Array(); + var names = this.getContent().names; + if(names){ + for(var i = 0; i !== names.length; ++i){ + // TODO: variant (-scope topicStubs) + var type = names[i].type; + if(type){ + if(referencedTopics.indexOf(type[0]) === -1) referencedTopics.push(type[0]); + } + var scopes = names[i].scopes; + if(scopes){ + for(var j = 0; j !== scopes.length; ++j){ + if(referencedTopics.indexOf(scopes[j]) === -1) referencedTopics.push(scopes[j]); + } + } + } + } + + var occurrences = this.getContent().occurrences; + if(occurrences){ + for(var i = 0; i !== occurrences.length; ++i){ + var type = occurrences[i].type; + if(type){ + if(referencedTopics.indexOf(type[0]) === -1) referencedTopics.push(type[0]); + } + var scopes = occurrences[i].scopes; + if(scopes){ + for(var j = 0; j !== scopes.length; ++j){ + if(referencedTopics.indexOf(scopes[j]) === -1) referencedTopics.push(scopes[j]); + } + } + } + } + return referencedTopics; }}); @@ -2302,8 +2340,9 @@ }, "getContent" : function(){ if(!this.isUsed()) return null; + var type = this.__type__.__frames__[0].getContent(); return {"itemIdentities" : this.__itemIdentity__.getContent(true, true), - "type" : new Array(this.__type__.__frames__[0].getContent()), + "type" : type ? new Array(type) : null, "scopes" : this.__scope__.getContent(), "roles" : this.__roles__.getContent()}; }, @@ -2412,6 +2451,32 @@ else rows[i].show(); } this.__minimized__ = !this.__minimized__; + }, + "getReferencedTopics" : function(){ + var referencedTopics = new Array(); + var associations = this.getContent(); + if(associations){ + for(var i = 0; i !== associations.length; ++i){ + var assType = associations[i].type; + if(referencedTopics.indexOf(assType[0]) === -1) referencedTopics.push(assType[0]); + var scopes = associations[i].scopes; + if(scopes){ + for(var j = 0; j !== scopes.length; ++j){ + if(referencedTopics.indexOf(scopes[j]) === -1) referencedTopics.push(scopes[j]); + } + } + var roles = associations[i].roles; + if(roles){ + for(var j = 0; j !== roles.length; ++j){ + var roleType = roles[j].type; + if(roleType && referencedTopics.indexOf(roleType[0]) === -1) referencedTopics.push(roleType[0]); + var player = roles[j].topicRef; + if(player && referencedTopics.indexOf(player[0]) === -1) referencedTopics.push(player[0]); + } + } + } + } + return referencedTopics; }}); Modified: trunk/src/ajax/javascripts/requests.js ============================================================================== --- trunk/src/ajax/javascripts/requests.js (original) +++ trunk/src/ajax/javascripts/requests.js Tue Jun 16 06:04:53 2009 @@ -52,4 +52,57 @@ catch(err){ alert("Could not request contraints, please try again!\n\n" + err); } +} + + +// --- gets all topicStubs information for the passed psis and +// --- executes the onSuccessHandler or the on FailureHandler +// --- if all stubs are requested or one request fails. +function getTopicStubs(psis, onSuccessHandler, onFailureHandler) +{ + if(!onSuccessHandler || !onFailureHandler) throw "From getTopicStubs(): onsuccessHandler and onFailureHandler must be set!"; + try{ + var topicStubs = new Array(); + + if(psis){ + for(var i = 0; i !== psis.length; ++i){ + var url = GET_STUB_PREFIX + psis[i].gsub("#", "%23"); + new Ajax.Request(url, { + "method" : "get", + "requestHeaders" : ["If-Modified-Since", "Thu, 1 Jan 1970 00:00:00 GMT"], + "onSuccess" : function(xhr){ + if(xhr.responseText.length === 0 || xhr.responseText.isJSON() === false) errorHandler("Got bad JSON-Data for \"" + psis[i] + "\"!"); + else topicStubs.push(xhr.responseText); + }, + "onFailure" : function(xhr){ + alert("From getTopicStubs(): Could not equest topicStub information for \"" + xhr.request.url + "\"!!!"); + onFailureHandler(); + }}); + } + } + + // --- Checks the requested value. If there are all values requested, there will be called the + // --- onSuccessHandler - otherwise (after the maximum time out or an faild request) there will + // --- be called the onErrorHandler. + var maxTimeout = psis.length * TIMEOUT; + var neededTime = 0; + function checkRequests(){ + var delta = 100; + neededTime += delta; + if(delta > maxTimeout){ + alert("From getTopicStubs(): Please check your network-connection - the request timed out!!!"); + onFailureHandler(); + return; + } + + if(topicStubs.length === psis.length) onSuccessHandler(topicStubs); + else setTimeout(checkRequests, delta); + } + + checkRequests(); + + } + catch(err){ + alert("From getTopicStubs(): Could not request topicStubs information for: " + psis + "\n\n" + err); + } } \ No newline at end of file

1 0

[isidorus-cvs] r41 - in trunk/src: ajax/css ajax/javascripts rest_interface unit_tests
by Lukas Giessmann 16 Jun '09

16 Jun '09

Author: lgiessmann Date: Tue Jun 16 03:27:00 2009 New Revision: 41 Log: ajax-client: added the functionality to disable optional elements, like optional itmeIdentity, subjectLocator, subjectIdentifier, names, occurrences, associations and roles. Modified: trunk/src/ajax/css/main.css trunk/src/ajax/javascripts/constants.js trunk/src/ajax/javascripts/create.js trunk/src/ajax/javascripts/datamodel.js trunk/src/rest_interface/set-up-json-interface.lisp trunk/src/unit_tests/poems.xtm Modified: trunk/src/ajax/css/main.css ============================================================================== --- trunk/src/ajax/css/main.css (original) +++ trunk/src/ajax/css/main.css Tue Jun 16 03:27:00 2009 @@ -34,6 +34,18 @@ cursor: pointer; } +.clickable:hover{ + color: #ff7f00; +} + +.deselect { + cursor: pointer; +} + +.deselect:hover{ + color: #ff7f00; +} + .errorMessage { color: red; font-size: 0.85em; Modified: trunk/src/ajax/javascripts/constants.js ============================================================================== --- trunk/src/ajax/javascripts/constants.js (original) +++ trunk/src/ajax/javascripts/constants.js Tue Jun 16 03:27:00 2009 @@ -72,6 +72,9 @@ "__divRoleContainer__" : "roleContainer", "__divRoleFrame__" : "roleFrame", "__divPlayerFrame__" : "playerFrame", + "__spanDeselect__" : "deselect", + "__divFog__" : "fog", + "__inputCommitButton__" : "commitButton", "page" : function(){ return this.__divPage__; }, "subPage" : function(){ return this.__divSubPage__; }, @@ -108,5 +111,8 @@ "associationFrame" : function(){ return this.__divAssociationFrame__; }, "roleContainer" : function(){ return this.__divRoleContainer__; }, "roleFrame" : function(){ return this.__divRoleFrame__; }, - "playerFrame" : function(){ return this.__divPlayerFrame__; } + "playerFrame" : function(){ return this.__divPlayerFrame__; }, + "deselect" : function(){ return this.__spanDeselect__; }, + "fog" : function(){ return this.__divFog__; }, + "commitButton" : function(){ return this.__inputCommitButton__; } }; \ No newline at end of file Modified: trunk/src/ajax/javascripts/create.js ============================================================================== --- trunk/src/ajax/javascripts/create.js (original) +++ trunk/src/ajax/javascripts/create.js Tue Jun 16 03:27:00 2009 @@ -36,6 +36,11 @@ items[i].remove(); } + items = $$("li." + CLASSES.commitButton()); + for(var i = 0; i !== items.length; ++i){ + items[i].remove(); + } + var instanceOfs = new Array(); for(var i = 0; psis && i !== psis.length; ++i){ instanceOfs.push(new Array(psis[i])); @@ -48,6 +53,15 @@ var associations = new AssociationContainerC(null, (constraints ? constraints.associationsConstraints : null), topic); var liA = new Element("li", {"class" : CLASSES.associationContainer()}).update(associations.getFrame()); liT.insert({"after" : liA}); + + var commitButton = new Element("input", {"type" : "button", "value" : "commit fragment", "style" : "float: right; margin-top: -10px;"}) + commitButton.observe("click", function(event){ + alert("commit fragment"); + }); + var liCB = new Element("li", {"class" : CLASSES.commitButton()}); + liCB.update(commitButton); + liA.insert({"after" : liCB}); + } function onSuccessHandler(xhr){ Modified: trunk/src/ajax/javascripts/datamodel.js ============================================================================== --- trunk/src/ajax/javascripts/datamodel.js (original) +++ trunk/src/ajax/javascripts/datamodel.js Tue Jun 16 03:27:00 2009 @@ -30,6 +30,7 @@ this.__frame__.insert({"bottom" : this.__content__}); this.__frame__.insert({"bottom" : this.__add__}); this.__frame__.insert({"bottom" : this.__error__}); + this.__disabled__ = false; setRemoveAddHandler(this, owner, min, max, function(){ return new FrameC("", owner, min, max); @@ -74,30 +75,45 @@ }, "append" : function(elem){ return this.getFrame().insert({"after" : elem}); + }, + "isUsed" : function(){ + return !this.__disabled__; }}); // --- This class represents a textrow with the functionality of FrameC plus the method isValid // --- which returns a boolean value depending on the instance's value and the given regular expression. -var TextrowC = Class.create(FrameC, {"initialize" : function($super, content, regexp, owner, min, max, cssTitle){ +var TextrowC = Class.create(FrameC, {"initialize" : function($super, content, regexp, owner, min, max, cssTitle, dblClickHandler){ $super(content, owner, min, max); owner.__frames__.pop(); owner.__frames__.push(this); + this.__owner__ = owner; + this.__min__ = min; + this.__max__ = max; this.__regexp__ = new RegExp(regexp); this.__frame__.writeAttribute({"class" : CLASSES.textrowWithRemoveButton()}); this.__content__.remove(); this.__content__ = new Element("input", {"type" : "text", "value" : content}); + this.__dblClickHandler__ = dblClickHandler; if(cssTitle && cssTitle.length){ this.__content__.writeAttribute({"title" : cssTitle}); } this.__remove__.insert({"after" : this.__content__}); checkRemoveAddButtons(owner, min, max); + var myself = this; setRemoveAddHandler(this, owner, min, max, function(){ - return new TextrowC("", regexp, owner, min, max, cssTitle); + return new TextrowC("", regexp, owner, min, max, cssTitle, dblClickHandler); + }); + + this.getFrame().observe("dblclick", function(event){ + dblClickHandler(owner, event); }); }, + "dblClick" : function(){ + if(this.__dblClickHandler__) this.__dblClickHandler__(this.__owner__); + }, "getContent" : function(){ return this.__content__.value; }, @@ -111,6 +127,17 @@ "hideRemoveButton" : function(){ this.__remove__.hide(); this.getFrame().writeAttribute({"class" : CLASSES.textrowWithoutRemoveButton()}); + }, + "disable" : function(){ + this.__content__.writeAttribute({"readonly" : "readonly"}); + this.hideRemoveButton(); + this.hideAddButton(); + this.__disabled__ = true; + }, + "enable" : function(){ + this.__content__.removeAttribute("readonly"); + checkRemoveAddButtons(this.__owner__, this.__min__, this.__max__); + this.__disabled__ = false; }}); @@ -145,8 +172,16 @@ "hideRemoveButton" : function(){ this.__remove__.hide(); this.getFrame().writeAttribute({"class" : CLASSES.selectrowWithoutRemoveButton()}); + }, + "disable" : function(){ + this.__content__.writeAttribute({"disabled" : "disables"}); + this.__disabled__ = true; + }, + "enable" : function(){ + this.__content__.removeAttribute("disabled"); + this.__disabled__ = false; }}); - + // --- The base Class for alomost all frames which contains other frames like names, occurrences, ... var ContainerC = Class.create({"initialize" : function(){ @@ -154,6 +189,7 @@ this.__error__ = new Element("div", {"class" : CLASSES.error()}); this.__error__.hide(); this.__frame__.insert({"bottom" : this.__error__}); + this.__disabled__ = false; }, "hide" : function(){ this.__frame__.hide(); @@ -194,6 +230,9 @@ }, "hideAddButton" : function(){ try{ this.__add__.hide(); } catch(err) {} + }, + "isUsed" : function(){ + return !this.__disabled__; }}); @@ -242,8 +281,7 @@ } myself.showError(str); } - else { - //successFun(contents, json); + else { successFun(myself.getContent(true, true), json); } } @@ -268,9 +306,8 @@ }}); - // --- Representation of a itemIdentity frame. -var ItemIdentityC = Class.create(ContainerC, {"initialize" : function($super, contents){ +var ItemIdentityC = Class.create(ContainerC, {"initialize" : function($super, contents, parent){ $super(); this.__frame__.writeAttribute({"class" : CLASSES.itemIdentityFrame()}); this.__container__ = new Object(); @@ -286,6 +323,25 @@ new TextrowC("", ".*", this.__container__, 1, -1, null); this.__error__.insert({"before" : this.__container__.__frames__[i].getFrame()}); } + finally { + function setDeactivateHandler(myself){ + myself.__frame__.observe("dblclick", function(event){ + if(myself.__container__.__frames__.length === 1){ + if(myself.isUsed() === true){ + myself.disable(); + Event.stop(event); + } + else { + myself.enable(); + if(parent.isUsed() === true) Event.stop(event); + } + } + }); + } + setDeactivateHandler(this); + + if(!contents || contents.length === 0) this.disable(); + } }, "getContent" : function(unique, removeNull){ var values = new Array(); @@ -299,9 +355,26 @@ "toJSON" : function(unique, removeNull){ var content = this.getContent(unique, removeNull); return content.length === 0 ? "null" : content.toJSON(); + }, + "disable" : function(){ + if(this.__container__.__frames__){ + for(var i = 0; i !== this.__container__.__frames__.length; ++i){ + this.__container__.__frames__[i].disable(); + } + } + this.__disabled__ = true; + }, + "enable" : function(){ + if(this.__container__.__frames__){ + for(var i = 0; i !== this.__container__.__frames__.length; ++i){ + this.__container__.__frames__[i].enable(); + } + } + this.__disabled__ = false; }}); + // --- Representation of a subjectLocator and subjectIdentifier frames. var IdentifierC = Class.create(ContainerC, {"initialize" : function($super, contents, constraints, cssClass){ $super(); @@ -317,8 +390,12 @@ if(max !== 0){ var cssTitle = "min: " + min + " max: " + max + " regular expression: " + constraints[i].regexp; for(var j = 0; j != (min === 0 ? 1 : min); ++j){ + + var dblClickHandler = null; + if(min === 0) dblClickHandler = dblClickHandlerF; var row = new TextrowC("", constraints[i].regexp, this.__containers__[i], - min === 0 ? 1 : min, max === "*" ? -1 : max, cssTitle); + min === 0 ? 1 : min, max === "*" ? -1 : max, cssTitle, dblClickHandler); + row.dblClick(); this.__error__.insert({"before" : row.getFrame()}); } } @@ -384,6 +461,8 @@ if(!contents || contents.length < min) throw "From ScopeC.resetRows(): contents.length (" + (contents ? contents.length : "null") + ") must be > min (" + min + ")!"; if(max !== -1 && min > max)throw "From FrameC(): min must be > max(" + max + ") and > 0 but is " + min; + this.__min__ = min; + this.__max__ = max; // --- creates an empty div element if(max === 0){ @@ -555,7 +634,7 @@ } }, "isUsed" : function(){ - return this.getContent(true, true).length !== 0; + return this.getContent(true, true).length !== 0 && !this.__disabled__; }, "getContent" : function(unique, removeNull){ var values = new Array(); @@ -572,6 +651,26 @@ return new Array(); } return values; + }, + "disable" : function(){ + var rows = this.getFrame().select("div"); + for(var i = 0; i != rows.length; ++i){ + rows[i].select("select")[0].disable(); + var buttons = rows[i].select("span." + CLASSES.clickable()); + buttons[0].hide(); + buttons[1].hide(); + } + this.__disabled__ = true; + }, + "enable" : function(){ + var rows = this.getFrame().select("div"); + for(var i = 0; i != rows.length; ++i){ + rows[i].select("select")[0].enable(); + var buttons = rows[i].select("span." + CLASSES.clickable()); + if(this.__min__ < rows.length && rows.length !== 1) buttons[0].show(); + if(this.__max__ === -1 || this.__max__ > rows.length) buttons[1].show(); + } + this.__disabled__ = false; }}); @@ -616,6 +715,7 @@ } }, "isUsed" : function(){ + if(this.__disabled__ === true) return false; for(var i = 0; i != this.__container__.length; ++i){ if(this.__container__[i].isUsed() === true) return true; } @@ -645,26 +745,37 @@ "toJSON" : function(){ if(this.getContent().length === 0) return "null"; return this.getContent().toJSON(); + }, + "disable" : function(){ + for(var i = 0; i !== this.__container__.length; ++i) this.__container__[i].disable(); + this.__disabled__ = true; + }, + "enable" : function(){ + for(var i = 0; i !== this.__container__.length; ++i) this.__container__[i].enable(); + this.__disabled__ = false; }}); // --- Representation of a variant element -var VariantC = Class.create(ContainerC, {"initialize" : function($super, contents, owner){ +var VariantC = Class.create(ContainerC, {"initialize" : function($super, contents, owner, dblClickHandler, parent){ $super(); if(!owner.__frames__) owner.__frames__ = new Array(); owner.__frames__.push(this); this.__frame__.writeAttribute({"class" : CLASSES.variantFrame()}); this.__table__ = new Element("table", {"class" : CLASSES.variantFrame()}); this.__frame__.insert({"top" : this.__table__}); + this.__owner__ = owner; + this.__owner__ = owner; + this.__dblClickHandler__ = dblClickHandler; try{ // --- control row + itemIdentity makeControlRow(this, 4, contents ? contents.itemIdentities : null); checkRemoveAddButtons(owner, 1, -1); setRemoveAddHandler(this, owner, 1, -1, function(){ - return new VariantC(null, owner); + return new VariantC(null, owner, dblClickHandler, parent); }); - + // --- scopes this.__scopes__ = null; //TODO: implement -> also in the server @@ -673,8 +784,10 @@ // --- resource value and datatype makeResource(this, contents, null, null, null); - // --- minimize - this.minimize(); + this.getFrame().observe("dblclick", function(event){ + dblClickHandler(owner, event); + if(parent.isUsed() === true)Event.stop(event); + }); } catch(err){ alert("From VariantC(): " + err); @@ -724,20 +837,29 @@ return this.__value__.value.strip() !== ""; }, "isUsed" : function(){ - return (this.__itemIdentity__.getContent(true, true).length !== 0 || - this.__value__.value.strip() !== "" || this.__datatype__.__frames__[0].getContent().strip() !== ""); - }, - "showRemoveButton" : function(){ - this.__remove__.show(); - }, - "hideRemoveButton" : function(){ - this.__remove__.hide(); + return !this.__disabled__; }, - "showAddButton" : function(){ - this.__add__.show(); + "disable" : function(){ + this.__itemIdentity__.disable(); + // TODO: scope + this.__value__.writeAttribute({"readonly" : "readonly"}); + this.__datatype__.__frames__[0].disable(); + this.hideRemoveButton(); + this.hideAddButton(); + this.getFrame().setStyle({"backgroundColor" : "#edeceb"}); + this.getFrame().setStyle({"border" : "1px solid darkgrey"}); + this.__disabled__ = true; }, - "hideAddButton" : function(){ - this.__add__.hide(); + "enable" : function(){ + this.__itemIdentity__.enable(); + // TODO: scope + this.__value__.removeAttribute("readonly"); + this.__datatype__.__frames__[0].enable(); + if(this.__owner__.__frames__.length > 1) this.showRemoveButton(); + this.showAddButton(); + this.getFrame().setStyle({"backgroundColor" : "inherit"}); + this.getFrame().setStyle({"border" : "none"}); + this.__disabled__ = false; }, "minimize" : function(){ var trs = this.__table__.select("tr"); @@ -749,20 +871,22 @@ // --- contains all variants of a name element -var VariantContainerC = Class.create(ContainerC, {"initialize" : function($super, contents){ +var VariantContainerC = Class.create(ContainerC, {"initialize" : function($super, contents, parent){ $super(); this.__frame__.writeAttribute({"class" : CLASSES.variantContainer()}); this.__container__ = new Object(); if(contents && contents.length != 0){ for(var i = 0; i != contents.length; ++i){ - var variant = new VariantC(contents[i], this.__container__); + var variant = new VariantC(contents[i], this.__container__, dblClickHandlerF, parent); this.__frame__.insert({"bottom" : variant.getFrame()}); + variant.minimize(); } } else { - var variant = new VariantC(null, this.__container__); + var variant = new VariantC(null, this.__container__, dblClickHandlerF, parent); this.__frame__.insert({"bottom" : variant.getFrame()}); + variant.minimize(); } }, "getContent" : function(){ @@ -793,11 +917,28 @@ } str += "]"; return str === "[]" ? null : str; + }, + "isUsed" : function(){ + return !this.__disabled__; + }, + "disable" : function(){ + if(this.__container__.__frames__){ + for(var i = 0; i !== this.__container__.__frames__.length; ++i) + this.__container__.__frames__[i].disable(); + } + this.__disabled__ = true; + }, + "enable" : function(){ + if(this.__container__.__frames__){ + for(var i = 0; i !== this.__container__.__frames__.length; ++i) + this.__container__.__frames__[i].enable(); + } + this.__disabled__ = false; }}); // --- representation of a name element -var NameC = Class.create(ContainerC, {"initialize" : function($super, contents, nametypescopes, simpleConstraint, owner, min, max, cssTitle){ +var NameC = Class.create(ContainerC, {"initialize" : function($super, contents, nametypescopes, simpleConstraint, owner, min, max, cssTitle, dblClickHandler){ $super(); if(!owner) throw "From NameC(): owner must be set but is null"; if(max !== -1 && (min > max || max === 0))throw "From FrameC(): min must be > max(" + max + ") and > 0 but is " + min; @@ -807,13 +948,16 @@ this.__frame__.writeAttribute({"class" : CLASSES.nameFrame()}); this.__table__ = new Element("table", {"class" : CLASSES.nameFrame()}); this.__frame__.insert({"top" : this.__table__}); + this.__max__ = max; + this.__owner__ = owner; + this.__dblClickHandler__ = dblClickHandler; try{ // --- control row + ItemIdentity makeControlRow(this, 5, contents ? contents.itemIdentities : null); checkRemoveAddButtons(owner, min, max); setRemoveAddHandler(this, owner, min, max, function(){ - return new NameC(null, nametypescopes, simpleConstraint, owner, min, max, cssTitle); + return new NameC(null, nametypescopes, simpleConstraint, owner, min, max, cssTitle, dblClickHandler); }); // --- type @@ -842,11 +986,12 @@ var _min = parseInt(simpleConstraint.cardMin); var _max = simpleConstraint.cardMax !== "MAX_INT" ? parseInt(simpleConstraint.cardMax) : "*"; var cssTitleV = "min: " + _min + " max: " + _max + " regular expression: " + (simpleConstraint ? simpleConstraint.regexp : ".*"); + this.__cssTitle__ = cssTitle; new TextrowC((contents ? contents.value : ""), (simpleConstraint ? simpleConstraint.regexp : ".*"), this.__value__, 1, 1, cssTitleV); this.__table__.insert({"bottom" : newRow(CLASSES.valueFrame(), "Value", this.__value__.__frames__[0].getFrame())}); // --- variants - this.__variants__ = new VariantContainerC(contents? contents.variants : null); + this.__variants__ = new VariantContainerC(contents? contents.variants : null, this); this.__table__.insert({"bottom" : newRow(CLASSES.variantContainer(), "Variants", this.__variants__.getFrame())}); // --- adds a second show handler, so the variants will be hidden, when the entire @@ -862,6 +1007,10 @@ } addSecondShowHandler(this); + + this.getFrame().observe("dblclick", function(event){ + dblClickHandler(owner, event); + }); } catch(err){ alert("From NameC(): " + err); @@ -882,11 +1031,6 @@ ",\"value\":" + this.__value__.__frames__[0].toJSON() + ",\"variants\":" + this.__variants__.toJSON() + "}"; }, - "isUsed" : function(){ - return this.__itemIdentity__.getContent(true, true).length !== 0 || - this.__value__.__frames__[0].getContent().strip().length !== 0 || - this.__variants__.getContent().length !== 0; - }, "isValid" : function(){ // TODO: check the content and the constraints + variants.isValid() return true; @@ -897,6 +1041,30 @@ if(i === 0) trs[i].show(); else trs[i].hide(); } + }, + "disable" : function(){ + this.__itemIdentity__.disable(); + this.__type__.__frames__[0].disable(); + this.__scope__.disable(); + this.__value__.__frames__[0].disable(); + this.__variants__.disable(); + this.getFrame().setStyle({"backgroundColor" : "#edeceb"}); + this.getFrame().setStyle({"border" : "1px solid darkgrey"}); + this.getFrame().writeAttribute({"title" : this.__cssTitle__}); + this.hideAddButton(); + this.__disabled__ = true; + }, + "enable" : function(){ + this.__itemIdentity__.enable(); + this.__type__.__frames__[0].enable(); + this.__scope__.enable(); + this.__value__.__frames__[0].enable(); + this.__variants__.enable(); + this.getFrame().setStyle({"backgroundColor" : "inherit"}); + this.getFrame().setStyle({"border" : "none"}); + this.getFrame().removeAttribute("title"); + checkRemoveAddButtons(this.__owner__, 1, this.__max__); + this.__disabled__ = false; }}); @@ -917,9 +1085,13 @@ var max = constraints[i].constraints[j].cardMax !== "MAX_INT" ? parseInt(constraints[i].constraints[j].cardMax) : "*"; var regexp = constraints[i].constraints[j].regexp; if(max !== 0){ + var dblClickHandler = null; + if(min === 0) dblClickHandler = dblClickHandlerF; + var title = "min: " + min + " max: " + max + " regular expression: " + regexp; var name = new NameC("", constraints[i].nametypescopes, constraints[i].constraints[j], - this.__containers__[i][j], min === 0 ? 1 : min, max === "*" ? -1 : max, title); + this.__containers__[i][j], min === 0 ? 1 : min, max === "*" ? -1 : max, title, dblClickHandler); + if(min === 0)name.disable(); this.__error__.insert({"before" : name.getFrame()}); if(min === 0)name.minimize(); } @@ -979,20 +1151,23 @@ // --- represenation of an occurrence element -var OccurrenceC = Class.create(ContainerC, {"initialize" : function($super, contents, occurrenceTypes, constraint, uniqueConstraints, owner, min, max, cssTitle){ +var OccurrenceC = Class.create(ContainerC, {"initialize" : function($super, contents, occurrenceTypes, constraint, uniqueConstraints, owner, min, max, cssTitle, dblClickHandler){ $super(); if(!owner.__frames__) owner.__frames__ = new Array(); owner.__frames__.push(this); this.__frame__.writeAttribute({"class" : CLASSES.occurrenceFrame()}); this.__table__ = new Element("table", {"class" : CLASSES.occurrenceFrame()}); this.__frame__.insert({"top" : this.__table__}); + this.__max__ = max; + this.__owner__ = owner; + this.__dblClickHandler__ = dblClickHandler; try{ // --- control row + itemIdentity makeControlRow(this, 5, contents ? contents.itemIdentities : null); checkRemoveAddButtons(owner, 1, max); setRemoveAddHandler(this, owner, 1, max, function(){ - return new OccurrenceC(null, occurrenceTypes, constraint, uniqueConstraints, owner, min, max, cssTitle); + return new OccurrenceC(null, occurrenceTypes, constraint, uniqueConstraints, owner, min, max, cssTitle, dblClickHandler); }); // --- type @@ -1014,13 +1189,18 @@ // --- scopes this.__scope__ = new ScopeContainerC(contents && contents.scopes ? contents.scopes : null, occurrenceTypes && occurrenceTypes[0].scopeConstraints ? occurrenceTypes[0].scopeConstraints : null); this.__table__.insert({"bottom" : newRow(CLASSES.scopeContainer(), "Scope", this.__scope__.getFrame())}); - onTypeChangeScope(this, contents.scopes, occurrenceTypes, "occurrence"); + onTypeChangeScope(this, contents && contents.scopes ? contents.scopes : null, occurrenceTypes, "occurrence"); // --- resource value and datatype var _min = parseInt(constraint.cardMin); var _max = constraint.cardMax !== "MAX_INT" ? parseInt(constraint.cardMax) : "*"; var cssTitle = "min: " + _min + " max: " + _max + " regular expression: " + constraint.regexp; + this.__cssTitle__ = cssTitle; makeResource(this, contents, constraint, (occurrenceTypes ? occurrenceTypes[0].datatypeConstraint : null), cssTitle); + + this.getFrame().observe("dblclick", function(event){ + dblClickHandler(owner, event); + }); } catch(err){ alert("From OccurrenceC(): " + err); @@ -1068,10 +1248,6 @@ return "null"; } }, - "isUsed" : function(){ - return this.__itemIdentity__.getContent(true, true).length !== 0 || - this.__value__.value.strip().length !== 0; - }, "isValid" : function(){ // TODO: check the content and the constraints return true; @@ -1082,6 +1258,30 @@ if(i === 0) trs[i].show(); else trs[i].hide(); } + }, + "disable" : function(){ + this.__itemIdentity__.disable(); + this.__type__.__frames__[0].disable(); + this.__scope__.disable(); + this.__value__.writeAttribute({"readonly" : "readonly"}); + this.__datatype__.__frames__[0].disable(); + this.getFrame().setStyle({"backgroundColor" : "#edeceb"}); + this.getFrame().setStyle({"border" : "1px solid darkgrey"}); + this.getFrame().writeAttribute({"title" : this.__cssTitle__}); + this.hideAddButton(); + this.__disabled__ = true; + }, + "enable" : function(){ + this.__itemIdentity__.enable(); + this.__type__.__frames__[0].enable(); + this.__scope__.enable(); + this.__value__.removeAttribute("readonly"); + this.__datatype__.__frames__[0].enable(); + this.getFrame().setStyle({"backgroundColor" : "inherit"}); + this.getFrame().setStyle({"border" : "none"}); + this.getFrame().removeAttribute("title"); + checkRemoveAddButtons(this.__owner__, 1, this.__max__); + this.__disabled__ = false; }}); @@ -1101,10 +1301,14 @@ var max = constraints[i].constraints[j].cardMax !== "MAX_INT" ? parseInt(constraints[i].constraints[j].cardMax) : "*"; var regexp = constraints[i].constraints[j].regexp; if(max !== 0){ + var dblClickHandler = null; + if(min === 0) dblClickHandler = dblClickHandlerF; + var title = "min: " + min + " max: " + max + " regular expression: " + regexp; var occurrence = new OccurrenceC("", constraints[i].occurrenceTypes, constraints[i].constraints[j], constraints[i].uniqueConstraints, this.__containers__[i][j], - min === 0 ? 1 : min, max === "*" ? -1 : max, title); + min === 0 ? 1 : min, max === "*" ? -1 : max, title, dblClickHandler); + if(min === 0) occurrence.disable(); this.__error__.insert({"before" : occurrence.getFrame()}); if(min === 0)occurrence.minimize(); } @@ -1188,7 +1392,7 @@ this.__table__.insert({"bottom" : newRow(CLASSES.topicIdFrame(), "Topic ID", this.__topicid__.__frames__[0].getFrame())}); // --- itemIdentity - this.__itemIdentity__ = new ItemIdentityC(content ? content.itemIdentities : null); + this.__itemIdentity__ = new ItemIdentityC(content ? content.itemIdentities : null, this); this.__table__.insert({"bottom" : newRow(CLASSES.itemIdentityFrame(), "ItemIdentity", this.__itemIdentity__.getFrame())}); // --- subjectLocator @@ -1270,7 +1474,7 @@ // --- representation of a role element. -var RoleC = Class.create(ContainerC, {"initialize" : function($super, itemIdentities, roleTypes, rolePlayers, owner){ +var RoleC = Class.create(ContainerC, {"initialize" : function($super, itemIdentities, roleTypes, rolePlayers, owner, typeMin, parent){ $super(); if(!owner.__frames__) owner.__frames__ = new Array(); if(!roleTypes || roleTypes.length === 0) throw "From RoleC(): roleTypes must be set!"; @@ -1281,6 +1485,9 @@ this.__frame__.insert({"top" : this.__table__}); this.__roleTypes__ = roleTypes; this.__rolePlayers__ = rolePlayers; + this.__owner__ = owner; + this.__typeMin__ = typeMin; + this.__parentElem__ = parent; try{ // --- control row + itemIdentity @@ -1303,6 +1510,28 @@ this.__player__ = new Object(); tr = newRow(CLASSES.playerFrame(), "Player", new SelectrowC(players, this.__player__, 1, 1).getFrame()); this.__table__.insert({"bottom" : tr}); + + function setDblClickHandler(myself){ + myself.getFrame().observe("dblclick", function(event){ + if(myself.__typeMin__ === 0){ + var roles = new Array(); + for(var i = 0; i !== owner.__frames__.length; ++i){ + if(roleTypes.flatten().indexOf(owner.__frames__[i].getType()) !== -1) + roles.push(owner.__frames__[i]); + } + + if(roles.length === 1 && roles[0].isUsed() === true){ + roles[0].disable(); + } + else if(roles.length === 1 && roles[0].isUsed() === false){ + roles[0].enable(); + } + if(parent.isUsed() === true)Event.stop(event); + } + }); + } + setDblClickHandler(this); + } catch(err){ alert("From RoleC(): " + err); @@ -1416,18 +1645,35 @@ return this.getType().length !== 0 && this.getPlayer().length !== 0; }, "isUsed" : function(){ - return this.getType().length !== 0 || this.getPlayer().length !== 0 || this.__itemIdentity__.getContent(true, true).length !== 0; + return !this.__disabled__; + }, + "disable" : function(){ + this.__itemIdentity__.disable(); + this.__type__.__frames__[0].disable(); + this.__player__.__frames__[0].disable(); + this.getFrame().setStyle({"backgroundColor" : "#edeceb"}); + this.getFrame().setStyle({"border" : "1px solid darkgrey"}); + this.__disabled__ = true; + }, + "enable" : function(){ + this.__itemIdentity__.enable(); + this.__type__.__frames__[0].enable(); + this.__player__.__frames__[0].enable(); + this.getFrame().setStyle({"backgroundColor" : "inherit"}); + this.getFrame().setStyle({"border" : "none"}); + this.__disabled__ = false; }}); // --- contains all roles of an association -var RoleContainerC = Class.create(ContainerC, {"initialize" : function($super, contents, associationRoleConstraints, rolePlayerConstraints, otherRoleConstraints){ +var RoleContainerC = Class.create(ContainerC, {"initialize" : function($super, contents, associationRoleConstraints, rolePlayerConstraints, otherRoleConstraints, parent){ $super(); this.__frame__.writeAttribute({"class" : CLASSES.roleContainer()}); this.__arContainer__ = new Object(); this.__orContainer__ = new Object(); this.__otherRoleConstraints__ = otherRoleConstraints; this.__rolePlayerConstraints__ = rolePlayerConstraints; + this.__parentElem__ = parent; try{ if((!contents || contents.length === 0) && associationRoleConstraints){ this.resetValues(associationRoleConstraints, rolePlayerConstraints, otherRoleConstraints); @@ -1486,6 +1732,7 @@ var allAvailablePlayers = extractPlayersOfConstraints(rolePlayerConstraints); var roleType = associationRoleConstraint.roleType; var roleMin = associationRoleConstraint.cardMin === 0 ? 1 : parseInt(associationRoleConstraint.cardMin); + var roleMinOrg = parseInt(associationRoleConstraint.cardMin); for(var i = 0; i !== rolePlayerConstraints.length; ++i){ var playerMin = rolePlayerConstraints[i].cardMin === 0 ? 1 : parseInt(rolePlayerConstraints[i].cardMin); if(rolePlayerConstraints[i].players.length < playerMin) throw "From __makeRolesFromARC__(): not enough players(=" + rolePlayerConstraints[i].players.length + ") to reach card-min(=" + playerMin + ") of roletype\"" + roleType.flatten()[0] + "\"!"; @@ -1497,7 +1744,7 @@ var cleanedPlayers = cleanPlayers(allAvailablePlayers, selectedPlayers); cleanedPlayers = cleanPlayers(cleanedPlayers, currentPlayers); cleanedPlayers = currentPlayers.concat(cleanedPlayers); - var role = new RoleC(null, roleType, cleanedPlayers, this.__arContainer__); + var role = new RoleC(null, roleType, cleanedPlayers, this.__arContainer__, roleMinOrg, this.__parentElem__); this.__setRoleChangePlayerHandler__(role, this.__arContainer__.__frames__, rolePlayerConstraints, null); this.__error__.insert({"before" : role.getFrame()}); // --- removes the new role's selected item from all other existing roles @@ -1532,7 +1779,7 @@ this.__arContainer__.__frames__[j].removePlayer(cleanedPlayers[0]); } - var role = new RoleC(null, roleType, cleanedPlayers, this.__arContainer__); + var role = new RoleC(null, roleType, cleanedPlayers, this.__arContainer__, roleMinOrg, this.__parentElem__); currentRoles.push(role); this.__setRoleChangePlayerHandler__(role, this.__arContainer__.__frames__, rolePlayerConstraints, null); this.__error__.insert({"before" : role.getFrame()}); @@ -1556,6 +1803,7 @@ var cOtherPlayers = orpcs[i].otherPlayers; var cOtherRoleType = orpcs[i].otherRoleType; var cMin = orpcs[i].cardMin === 0 ? 1 : parseInt(orpcs[i].cardMin); + var cMinOrg = parseInt(orpcs[i].cardMin); if(!cOtherPlayers || cOtherPlayers.length < cMin) throw "from __makeRolesFromORC__(): not enough players(=" + cOtherPlayers.length + ") for roletype + \"" + cOtherRoleType.flatten()[0] + "\"!"; var existingRoles = this.getExistingRoles(cOtherRoleType, cOtherPlayers, this.__orContainer__.__frames__); for(var j = 0; j < cMin - existingRoles.length; ++j){ @@ -1574,7 +1822,7 @@ this.__orContainer__.__frames__[j].removePlayer(cleanedPlayers[0]); } - var role = new RoleC(null, cOtherRoleType, cleanedPlayers, this.__orContainer__); + var role = new RoleC(null, cOtherRoleType, cleanedPlayers, this.__orContainer__, cMinOrg, this.__parentElem__); this.__checkORCButtons__(role, orpcs[i]); this.__setRoleChangePlayerHandler__(role, this.__orContainer__.__frames__, null, orpcs); this.__setORCAddHandler__(role, orpcs[i], orpcs); @@ -1641,6 +1889,7 @@ var cOtherRoleType = currentConstraint.otherRoleType; var cardMax = currentConstraint.cardMax === "MAX_INT" ? "*" : parseInt(currentConstraint.cardMax); var cardMin = currentConstraint.cardMin === 0 ? 1 : parseInt(currentConstraint.cardMin); + var cardMinOrg = parseInt(currentConstraint.cardMin);; var existingRoles = roleContainer.getExistingRoles(cOtherRoleType, cOtherPlayers, roleContainer.__orContainer__.__frames__); var cleanedPlayers = new Array(); for(var i = 0; i !== cOtherPlayers.length; ++i){ @@ -1651,7 +1900,7 @@ // --- creates new role if(cleanedPlayers.length !== 0){ - var role = new RoleC(null, cOtherRoleType, cleanedPlayers, roleContainer.__orContainer__); + var role = new RoleC(null, cOtherRoleType, cleanedPlayers, roleContainer.__orContainer__, cardMinOrg, this.__parentElem__); roleContainer.__checkORCButtons__(role, currentConstraint); roleContainer.__setRoleChangePlayerHandler__(role, roleContainer.__orContainer__.__frames__, null, constraints); roleContainer.__setORCAddHandler__(role, currentConstraint, constraints); @@ -1736,11 +1985,12 @@ // --- creates a new role var cardMax = associationRoleConstraint.cardMax === "MAX_INT" ? "*" : parseInt(associationRoleConstraint.cardMax); + var cardMin = parseInt(associationRoleConstraint.cardMin); if(cardMax === "*" || cardMax > rolesToCheck.length){ var usedPlayers = new Array(); for(var i = 0; i !== rolesToCheck.length; ++i) usedPlayers.push(rolesToCheck[i].getPlayer()); var cleanedPlayers = cleanPlayers(players ? players : new Array(), usedPlayers); - var role = new RoleC(null, roleType, cleanedPlayers, roleContainer.__arContainer__); + var role = new RoleC(null, roleType, cleanedPlayers, roleContainer.__arContainer__, cardMin, this.__parentElem__); var foundRpcs = getRolePlayerConstraintsForRole(roleType, roleContainer.__rolePlayerConstraints__); roleContainer.__setRoleChangePlayerHandler__(role, roleContainer.__arContainer__.__frames__, foundRpcs, null); roleContainer.__setARCAddHandler__(role, players, associationRoleConstraint); @@ -1934,6 +2184,24 @@ } return roles.substring(0, roles.length - 1) + "]"; }, + "disable" : function(){ + if(this.__orContainer__.__frames__){ + for(var i = 0; i !== this.__orContainer__.__frames__.length; ++i) this.__orContainer__.__frames__[i].disable(); + } + if(this.__arContainer__.__frames__){ + for(var i = 0; i !== this.__arContainer__.__frames__.length; ++i) this.__arContainer__.__frames__[i].disable(); + } + this.__disabled__ = true; + }, + "enable" : function(){ + if(this.__orContainer__.__frames__){ + for(var i = 0; i !== this.__orContainer__.__frames__.length; ++i) this.__orContainer__.__frames__[i].enable(); + } + if(this.__arContainer__.__frames__){ + for(var i = 0; i !== this.__arContainer__.__frames__.length; ++i) this.__arContainer__.__frames__[i].enable(); + } + this.__disable__ = false; + }, "isValid" : function(){ // TODO: implement return true; @@ -1952,6 +2220,8 @@ this.__frame__.insert({"top" : this.__table__}); this.__constraints__ = constraints; this.__contents__ = contents; + this.__owner__ = owner; + this.__dblClickHandler__ = dblClickHandlerF; try{ // --- control row + ItemIdentity @@ -1989,11 +2259,18 @@ _otherRoleConstraints = this.__constraints__[0].otherRoleConstraints; } - this.__roles__ = new RoleContainerC(this.__contents__ ? this.__contents__.roles : null, _roleConstraints, _playerConstraints, _otherRoleConstraints); + this.__roles__ = new RoleContainerC(this.__contents__ ? this.__contents__.roles : null, _roleConstraints, _playerConstraints, _otherRoleConstraints, this); this.__table__.insert({"bottom" : newRow(CLASSES.roleContainer(), "Roles", this.__roles__.getFrame())}); // --- registers the onChangeHandler of the Type-selectrow onTypeChangeScope(this, null, null, "association"); + + function setDblClickHandler(myself){ + myself.getFrame().observe("dblclick", function(event){ + myself.__dblClickHandler__(owner, event); + }); + } + setDblClickHandler(this); } catch(err){ alert("From AssociationC(): " + err); @@ -2041,9 +2318,27 @@ // TODO: implement return true; }, - "isUsed" : function(){ - // TODO: implement (activate button) - return true; + "disable" : function(){ + this.__itemIdentity__.disable(); + this.__roles__.disable(); + this.__type__.__frames__[0].disable(); + this.__scope__.disable(); + this.hideRemoveButton(); + this.hideAddButton(); + this.getFrame().setStyle({"backgroundColor" : "#edeceb"}); + this.getFrame().setStyle({"border" : "1px solid darkgrey"}); + this.__disabled__ = true; + }, + "enable" : function(){ + this.__itemIdentity__.enable(); + this.__roles__.enable(); + this.__type__.__frames__[0].enable(); + this.__scope__.enable(); + if(this.__owner__.__frames__.length > 1) this.showRemoveButton(); + this.showAddButton(); + this.getFrame().setStyle({"backgroundColor" : "inherit"}); + this.getFrame().setStyle({"border" : "none"}); + this.__disabled__ = false; }}); @@ -2084,18 +2379,6 @@ }); } setMinimizeHandler(this); - - var button = new Element("input", {"type" : "button", "value" : "toJSON()"}); - function test(myself){ - button.observe("click", function(event){ - try{ - alert("content:\n\n" + myself.getContent()); - alert("JSON:\n\n" + myself.toJSON().gsub("\"topicRef\":\\[\"\\*\\*current-topic\\*\\*\"\\]", myself.__mainTopic__.getContent().subjectIdentifiers.toJSON())); - }catch(err){ alert("test: " + err); } - }); - } - test(this); - this.getFrame().insert({"bottom" : button}); } catch(err){ alert("From AssociationContainerC(): " + err); @@ -2173,15 +2456,17 @@ - - - - - - - - - +// --- A handler for the dblclick-event. So a frame can be disabled or enabled. +function dblClickHandlerF(owner, event){ + if(owner.__frames__.length === 1){ + if(owner.__frames__[0].isUsed() === true){ + owner.__frames__[0].disable(); + } + else { + if(!owner.__frames__[0].__parentElem__ || owner.__frames__[0].__parentElem__.isUsed() === true) owner.__frames__[0].enable(); + } + } +} // --- helper function to create a dom-fragment of the form @@ -2202,31 +2487,39 @@ myself.__remove__.stopObserving(); myself.__add__.stopObserving(); myself.__remove__.observe("click", function(event){ - myself.remove(); - owner.__frames__ = owner.__frames__.without(myself); - if(min >= owner.__frames__.length){ - for(var i = 0; i != owner.__frames__.length; ++i){ - owner.__frames__[i].hideRemoveButton(); + var disabled = false; + try{ disabled = myself.__disabled__; } catch(err){ }; + if(disabled === false){ + myself.remove(); + owner.__frames__ = owner.__frames__.without(myself); + if(min >= owner.__frames__.length){ + for(var i = 0; i != owner.__frames__.length; ++i){ + owner.__frames__[i].hideRemoveButton(); + } } - } - if(max > owner.__frames__.length){ - for(var i = 0; i != owner.__frames__.length; ++i){ - owner.__frames__[i].showAddButton(); + if(max > owner.__frames__.length){ + for(var i = 0; i != owner.__frames__.length; ++i){ + owner.__frames__[i].showAddButton(); + } } } }); myself.__add__.observe("click", function(event){ - var newElem = call(); - myself.append(newElem.getFrame()); - if(remove === true && min !== -1 && owner.__frames__.length > min){ - for(var i = 0; i != owner.__frames__.length; ++i){ - owner.__frames__[i].showRemoveButton(); + var disabled = false; + try{ disabled = myself.__disabled__; } catch(err){ }; + if(disabled === false){ + var newElem = call(); + myself.append(newElem.getFrame()); + if(remove === true && min !== -1 && owner.__frames__.length > min){ + for(var i = 0; i != owner.__frames__.length; ++i){ + owner.__frames__[i].showRemoveButton(); + } } - } - if(max > -1 && max <= owner.__frames__.length){ - for(var i = 0; i != owner.__frames__.length; ++i){ - owner.__frames__[i].hideAddButton(); + if(max > -1 && max <= owner.__frames__.length){ + for(var i = 0; i != owner.__frames__.length; ++i){ + owner.__frames__[i].hideAddButton(); + } } } }); @@ -2255,12 +2548,17 @@ owner.__frames__[i].hideAddButton(); } } + + if(max === -1 || max > owner.__frames__.length){ + for(var i = 0; i != owner.__frames__.length; ++i){ + owner.__frames__[i].showAddButton(); + } + } } // --- creates a control row for NameC, OccurrenceC and VariantC with a nested ItemIdentity frame. -function makeControlRow(myself, rowspan, contents) -{ +function makeControlRow(myself, rowspan, contents){ var tr = new Element("tr", {"class" : CLASSES.itemIdentityFrame()}); var tdCtrl = new Element("td", {"class" : CLASSES.controlColumn(), "rowspan" : rowspan}); tr.insert({"top" : tdCtrl}) @@ -2277,7 +2575,7 @@ tdCtrl.insert({"bottom" : myself.__add__}); var tdCont = new Element("td", {"class" : CLASSES.content()}); tr.insert({"bottom" : tdCont}); - myself.__itemIdentity__ = new ItemIdentityC(contents ? contents.itemIdentities : null); + myself.__itemIdentity__ = new ItemIdentityC(contents ? contents.itemIdentities : null, myself); tdCont.insert({"top" : myself.__itemIdentity__.getFrame()}); myself.__table__.insert({"bottom" : tr}); @@ -2379,7 +2677,7 @@ }catch(err){} try{ this.__datatype__.__frames__[0].remove(); - this.__datytype__ = new Object(); + this.__datatype__ = new Object(); }catch(err){} myself.__value__ = new Element("textarea", {"rows" : 3}).update(value); Modified: trunk/src/rest_interface/set-up-json-interface.lisp ============================================================================== --- trunk/src/rest_interface/set-up-json-interface.lisp (original) +++ trunk/src/rest_interface/set-up-json-interface.lisp Tue Jun 16 03:27:00 2009 @@ -180,30 +180,6 @@ (format nil "Condition: \"~a\"" err)))))) (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+)))) -;(defun return-tmcl-info-of-psis(treat-as &otptional psi) -; "Returns a json string which represents the defined tmcl-constraints of the -; topic and the associations where this topic can be a player." -; (alert psi) -; (let ((http-method (hunchentoot:request-method*))) -; (if (eq http-method :GET) -; (let ((identifier (string-replace psi "%23" "#"))) -; (setf (hunchentoot:content-type*) "application/json") ;RFC 4627 -; (handler-case (let ((tmcl -; (json-tmcl:get-constraints-of-fragment identifier :treat-as treat-as))) -; (if tmcl -; (progn -; (setf (hunchentoot:content-type*) "application/json") ;RFC 4627 -; tmcl) -; (progn -; (setf (hunchentoot:return-code*) hunchentoot:+http-not-found+) -; (setf (hunchentoot:content-type*) "text") -; (format nil "Topic \"~a\" not found." psis)))) -; (condition (err) (progn -; (setf (hunchentoot:return-code*) hunchentoot:+http-internal-server-error+) -; (setf (hunchentoot:content-type*) "text") -; (format nil "Condition: \"~a\"" err))))) -; (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+)))) - (defun return-all-topic-psis (&optional param) "return all psis currently existing in isidorus as a list of list. every topic is a list Modified: trunk/src/unit_tests/poems.xtm ============================================================================== --- trunk/src/unit_tests/poems.xtm (original) +++ trunk/src/unit_tests/poems.xtm Tue Jun 16 03:27:00 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <tm:topicMap version="2.0" xmlns:tm="http://www.topicmaps.org/xtm/"> -  +  <tm:topic id="scoped-born-in-constraint-1"> <tm:subjectIdentifier href="http://some.where/constraint-psis/scoped-born-in-constraint-1"/> <tm:instanceOf><tm:topicRef href="#associationtypescope-constraint"/></tm:instanceOf> @@ -1301,7 +1301,7 @@ </tm:occurrence> <tm:occurrence> <tm:type><tm:topicRef href="#card-max"/></tm:type> - <tm:resourceData datatype="http://www.w3.org/2001/XMLSchema#unsignedInt">2</tm:resourceData> + <tm:resourceData datatype="http://www.w3.org/2001/XMLSchema#unsignedInt">1</tm:resourceData> </tm:occurrence> <tm:occurrence> <tm:type><tm:topicRef href="#regexp"/></tm:type>

1 0

[isidorus-cvs] r40 - trunk/src/ajax/javascripts
by Lukas Giessmann 11 Jun '09

11 Jun '09

Author: lgiessmann Date: Thu Jun 11 14:10:31 2009 New Revision: 40 Log: ajax-client: added a "player-remove"-handler for roles; fixed a problem with roles depending on otherrole-constraints by adding new roles depending on associationrole-constraints Modified: trunk/src/ajax/javascripts/datamodel.js Modified: trunk/src/ajax/javascripts/datamodel.js ============================================================================== --- trunk/src/ajax/javascripts/datamodel.js (original) +++ trunk/src/ajax/javascripts/datamodel.js Thu Jun 11 14:10:31 2009 @@ -1625,7 +1625,7 @@ for(var i = 0; i !== rolesToCheck.length; ++i) rolesToCheck[i].hideRemoveButton(); } - if(cardMax > rolesToCheck.length && rolesToCheck.length < lenPlayers){ + if(cardMax === "*" || cardMax > rolesToCheck.length && rolesToCheck.length < lenPlayers){ for(var i = 0; i !== rolesToCheck.length; ++i) rolesToCheck[i].showAddButton(); } else { @@ -1742,11 +1742,9 @@ var cleanedPlayers = cleanPlayers(players ? players : new Array(), usedPlayers); var role = new RoleC(null, roleType, cleanedPlayers, roleContainer.__arContainer__); var foundRpcs = getRolePlayerConstraintsForRole(roleType, roleContainer.__rolePlayerConstraints__); - alert("frpcs: " + foundRpcs.length); roleContainer.__setRoleChangePlayerHandler__(role, roleContainer.__arContainer__.__frames__, foundRpcs, null); roleContainer.__setARCAddHandler__(role, players, associationRoleConstraint); roleContainer.__setARCRemoveHandler__(role, associationRoleConstraint); - roleContainer.__error__.insert({"before" : role.getFrame()}); // --- removes the new role's selected item from all other existing roles for(var j = 0; j !== rolesToCheck.length; ++j){ @@ -1754,6 +1752,7 @@ } roleContainer.__arContainer__.__frames__[roleContainer.__arContainer__.__frames__.length - 2].getFrame().insert({"after" : role.getFrame()}); rolesToCheck.push(role); + roleContainer.__checkORCRoles__(role); } roleContainer.__checkARCButtons__(rolesToCheck, players, associationRoleConstraint); @@ -1764,9 +1763,43 @@ "__setARCRemoveHandler__" : function(role, associationRoleConstraint){ if(!role || !associationRoleConstraint) return; + var roleContainer = this; function removeHandler(myself){ - alert("myself: " + myself + "!!!"); + var cardMin = associationRoleConstraint.cardMin === 0 ? 1 : parseInt(associationRoleConstraint.cardMin); + var roleType = associationRoleConstraint.roleType.flatten(); + var rolesToCheck = new Array(); + for(var i = 0; i !== roleContainer.__arContainer__.__frames__.length; ++i){ + if(roleType.indexOf(roleContainer.__arContainer__.__frames__[i].getType()) !== -1) + rolesToCheck.push(roleContainer.__arContainer__.__frames__[i]); + } + // --- removes the role + if(cardMin < rolesToCheck.length){ + // --- gets the player which is selected by the role has to be removed + var player = null; + for(var i = 0; roleContainer.__rolePlayerConstraints__ && i !== roleContainer.__rolePlayerConstraints__.length; ++i){ + if(player !== null) break; + for(var j = 0; roleContainer.__rolePlayerConstraints__[i].players && j !== roleContainer.__rolePlayerConstraints__[i].players.length; ++j){ + if(roleContainer.__rolePlayerConstraints__[i].players[j].indexOf(role.getPlayer()) !== -1){ + player = roleContainer.__rolePlayerConstraints__[i].players[j]; + break; + } + } + } + rolesToCheck = rolesToCheck.without(role); + role.remove(); + roleContainer.__arContainer__.__frames__ = roleContainer.__arContainer__.__frames__.without(role); + + // --- adds the player which was selected by the removed role to all other + // --- existing roles of the same type + for(var i = 0; i !== rolesToCheck.length; ++i){ + rolesToCheck[i].addPlayer(player); + } + } + var foundRpcs = getRolePlayerConstraintsForRole(associationRoleConstraint.roleType, roleContainer.__rolePlayerConstraints__); + var players = extractPlayersOfConstraints(foundRpcs); + roleContainer.__checkARCButtons__(rolesToCheck, players, associationRoleConstraint); + roleContainer.__checkORCRoles__(null); } role.setRemoveHandler(removeHandler); @@ -1877,7 +1910,7 @@ } // --- creates new roles from other role-constraints, which has to exist or are optional - this.__makeRolesFromORC__(changedRole.getType(), changedRole.getPlayer()); + if(changedRole) this.__makeRolesFromORC__(changedRole.getType(), changedRole.getPlayer()); }, "getContent" : function(){ if((!this.__orContainer__.__frames__ && this.__orContainer__.frames__.length === 0) || (!this.__arContainer__.__frames__ && this.__arContainer__.__frames__.length === 0)) return null;

1 0

[isidorus-cvs] r39 - trunk/src/ajax/javascripts
by Lukas Giessmann 11 Jun '09

11 Jun '09

Author: lgiessmann Date: Thu Jun 11 13:02:00 2009 New Revision: 39 Log: ajax-client: added an "add-player"-handler to the role container Modified: trunk/src/ajax/javascripts/datamodel.js Modified: trunk/src/ajax/javascripts/datamodel.js ============================================================================== --- trunk/src/ajax/javascripts/datamodel.js (original) +++ trunk/src/ajax/javascripts/datamodel.js Thu Jun 11 13:02:00 2009 @@ -1427,6 +1427,7 @@ this.__arContainer__ = new Object(); this.__orContainer__ = new Object(); this.__otherRoleConstraints__ = otherRoleConstraints; + this.__rolePlayerConstraints__ = rolePlayerConstraints; try{ if((!contents || contents.length === 0) && associationRoleConstraints){ this.resetValues(associationRoleConstraints, rolePlayerConstraints, otherRoleConstraints); @@ -1498,8 +1499,6 @@ cleanedPlayers = currentPlayers.concat(cleanedPlayers); var role = new RoleC(null, roleType, cleanedPlayers, this.__arContainer__); this.__setRoleChangePlayerHandler__(role, this.__arContainer__.__frames__, rolePlayerConstraints, null); - this.__setARCAddHandler__(role, associationRoleConstraint, rolePlayerConstraints[i]); - this.__setARCRemoveHandler__(role, associationRoleConstraint, rolePlayerConstraints[i]); this.__error__.insert({"before" : role.getFrame()}); // --- removes the new role's selected item from all other existing roles for(var j = 0; j !== currentRoles.length; ++j){ @@ -1536,8 +1535,6 @@ var role = new RoleC(null, roleType, cleanedPlayers, this.__arContainer__); currentRoles.push(role); this.__setRoleChangePlayerHandler__(role, this.__arContainer__.__frames__, rolePlayerConstraints, null); - this.__setARCAddHandler__(role, associationRoleConstraint, rolePlayerConstraints[i]); - this.__setARCRemoveHandler__(role, associationRoleConstraint, rolePlayerConstraints[i]); this.__error__.insert({"before" : role.getFrame()}); ++rolesCreated; ++currentlyCreated; @@ -1546,8 +1543,10 @@ if(currentlyCreated === 0) throw "Not enough players to create all needed roles of the type \"" + roleType.flatten()[0] + "\"!"; }; this.__checkARCButtons__(currentRoles, allAvailablePlayers, associationRoleConstraint); - for(var i = 0; i !== currentRoles.length; ++i) + for(var i = 0; i !== currentRoles.length; ++i){ this.__setARCAddHandler__(currentRoles[i], allAvailablePlayers, associationRoleConstraint); + this.__setARCRemoveHandler__(currentRoles[i], associationRoleConstraint); + } }, "__makeRolesFromORC__" : function(roleType, player){ var orpcs = getOtherRoleConstraintsForRole(new Array(roleType), new Array(player), this.__otherRoleConstraints__); @@ -1728,7 +1727,6 @@ var roleContainer = this; function addHandler(myself){ - try{ var roleType = associationRoleConstraint.roleType.flatten(); var rolesToCheck = new Array(); for(var i = 0; i !== roleContainer.__arContainer__.__frames__.length; ++i){ @@ -1743,28 +1741,32 @@ for(var i = 0; i !== rolesToCheck.length; ++i) usedPlayers.push(rolesToCheck[i].getPlayer()); var cleanedPlayers = cleanPlayers(players ? players : new Array(), usedPlayers); var role = new RoleC(null, roleType, cleanedPlayers, roleContainer.__arContainer__); + var foundRpcs = getRolePlayerConstraintsForRole(roleType, roleContainer.__rolePlayerConstraints__); + alert("frpcs: " + foundRpcs.length); + roleContainer.__setRoleChangePlayerHandler__(role, roleContainer.__arContainer__.__frames__, foundRpcs, null); + roleContainer.__setARCAddHandler__(role, players, associationRoleConstraint); + roleContainer.__setARCRemoveHandler__(role, associationRoleConstraint); + roleContainer.__error__.insert({"before" : role.getFrame()}); -//-----------------> - /*this.__setRoleChangePlayerHandler__(role, roleContainer.__arContainer__.__frames__, rolePlayerConstraints, null); - this.__setARCAddHandler__(role, associationRoleConstraint, rolePlayerConstraints[i]); - this.__setARCRemoveHandler__(role, associationRoleConstraint, rolePlayerConstraints[i]);*/ + // --- removes the new role's selected item from all other existing roles + for(var j = 0; j !== rolesToCheck.length; ++j){ + rolesToCheck[j].removePlayer(new Array(role.getPlayer())); + } roleContainer.__arContainer__.__frames__[roleContainer.__arContainer__.__frames__.length - 2].getFrame().insert({"after" : role.getFrame()}); rolesToCheck.push(role); -// TODO: otherrole-constraints 1/3 } roleContainer.__checkARCButtons__(rolesToCheck, players, associationRoleConstraint); - }catch(err){ alert("err: " + err); } } role.setAddHandler(addHandler); }, - "__setARCRemoveHandler__" : function(role, arConstraint, rpConstraint){ - if(!role || !arConstraint || !rpConstraint) return; + "__setARCRemoveHandler__" : function(role, associationRoleConstraint){ + if(!role || !associationRoleConstraint) return; function removeHandler(myself){ alert("myself: " + myself + "!!!"); -// TODO: otherrole-constraints 2/3 + } role.setRemoveHandler(removeHandler);

1 0

[isidorus-cvs] r38 - trunk/src/ajax/javascripts
by Lukas Giessmann 11 Jun '09

11 Jun '09

Author: lgiessmann Date: Thu Jun 11 09:40:44 2009 New Revision: 38 Log: fixsed some problems with roles created from otherrole-constraints by using the "onPlayerChange" handler; so by changing players of roles created from roleplayer-constraints there will be checked and corrected all otherroles Modified: trunk/src/ajax/javascripts/datamodel.js Modified: trunk/src/ajax/javascripts/datamodel.js ============================================================================== --- trunk/src/ajax/javascripts/datamodel.js (original) +++ trunk/src/ajax/javascripts/datamodel.js Thu Jun 11 09:40:44 2009 @@ -1426,6 +1426,7 @@ this.__frame__.writeAttribute({"class" : CLASSES.roleContainer()}); this.__arContainer__ = new Object(); this.__orContainer__ = new Object(); + this.__otherRoleConstraints__ = otherRoleConstraints; try{ if((!contents || contents.length === 0) && associationRoleConstraints){ this.resetValues(associationRoleConstraints, rolePlayerConstraints, otherRoleConstraints); @@ -1826,7 +1827,7 @@ } } existingRoles = existingRoles.without(role); - + // --- removes and adds the new selected psi-value // --- and the old deselected psi if the player is another one if(playerToRemove.indexOf(role.getLastPlayer()) === -1){ @@ -1835,11 +1836,47 @@ existingRoles[i].removePlayer(playerToRemove); } } -// TODO: otherrole-constraints 3/3 + + // --- chekcs roles created from otherrole-contraints + myself.__checkORCRoles__(role); }); } setEvent(this); }, + "__checkORCRoles__" : function(changedRole){ + // --- removes all roles created from otherrole-constraints, which + // --- currently must not exist + var toRemove = new Array(); + for(var i = 0; i !== this.__orContainer__.__frames__.length; ++i){ + var oRole = this.__orContainer__.__frames__[i]; + var orcs = new Array(); // found orcs for the existing orc-roles + var checkedOrcs = new Array(); + for(var j = 0; this.__otherRoleConstraints__ && j !== this.__otherRoleConstraints__.length; ++j){ + var orc = this.__otherRoleConstraints__[j]; + if(orc.otherRoleType.flatten().indexOf(oRole.getType()) !== -1 && orc.otherPlayers.flatten().indexOf(oRole.getPlayer()) !== -1) orcs.push(orc); + } + + for(var j = 0; j !== orcs.length; ++j){ + for(var k = 0; this.__arContainer__.__frames__ && k !== this.__arContainer__.__frames__.length; ++k){ + var aRole = this.__arContainer__.__frames__[k]; + if(orcs[j].roleType.flatten().indexOf(aRole.getType()) !== -1 && orcs[j].players.flatten().indexOf(aRole.getPlayer()) !== -1){ + checkedOrcs.push(orcs[j]); + break; + } + } + } + + // --- no otherrole-constraints exist for this roles, so they have to be removed + if(checkedOrcs.length === 0) toRemove.push(oRole); + } + for(var i = 0; i !== toRemove.length; ++i){ + this.__orContainer__.__frames__ = this.__orContainer__.__frames__.without(toRemove[i]); + toRemove[i].remove(); + } + + // --- creates new roles from other role-constraints, which has to exist or are optional + this.__makeRolesFromORC__(changedRole.getType(), changedRole.getPlayer()); + }, "getContent" : function(){ if((!this.__orContainer__.__frames__ && this.__orContainer__.frames__.length === 0) || (!this.__arContainer__.__frames__ && this.__arContainer__.__frames__.length === 0)) return null; var roles = new Array();

1 0

[isidorus-cvs] r37 - trunk/src/ajax/javascripts
by Lukas Giessmann 11 Jun '09

11 Jun '09

Author: lgiessmann Date: Thu Jun 11 08:40:44 2009 New Revision: 37 Log: fixed some problems by creating associationroles from associationrole-constraints Modified: trunk/src/ajax/javascripts/datamodel.js Modified: trunk/src/ajax/javascripts/datamodel.js ============================================================================== --- trunk/src/ajax/javascripts/datamodel.js (original) +++ trunk/src/ajax/javascripts/datamodel.js Thu Jun 11 08:40:44 2009 @@ -1479,29 +1479,33 @@ checkCardinalitiesARC_RPC(associationRoleConstraint, rolePlayerConstraints); // --- creates all roles with all needed players + var currentRoles = new Array(); var rolesCreated = 0; var allAvailablePlayers = extractPlayersOfConstraints(rolePlayerConstraints); var roleType = associationRoleConstraint.roleType; var roleMin = associationRoleConstraint.cardMin === 0 ? 1 : parseInt(associationRoleConstraint.cardMin); for(var i = 0; i !== rolePlayerConstraints.length; ++i){ var playerMin = rolePlayerConstraints[i].cardMin === 0 ? 1 : parseInt(rolePlayerConstraints[i].cardMin); - var currentAvailablePlayers = rolePlayerConstraints[i].players; - var cleanedPlayers = cleanPlayers(allAvailablePlayers, currentAvailablePlayers); - for(var j = playerMin; j < currentAvailablePlayers.length; ++j){ - cleanedPlayers.push(currentAvailablePlayers[j]); - } - if(currentAvailablePlayers.length < playerMin) throw "From __makeRolesFromARC__(): not enough players(=" + currentAvailablePlayers.length + ") to reach card-min(=" + playerMin + ") of roletype\"" + roleType.flatten()[0] + "\"!"; - for(var j = 0; j !== playerMin; ++j){ - var selectedPlayer = currentAvailablePlayers[j]; - var _players = cleanedPlayers; - _players.unshift(selectedPlayer); - var role = new RoleC(null, roleType, _players, this.__arContainer__); - this.__checkARCButtons__(role, associationRoleConstraint, rolePlayerConstraints[i]); + if(rolePlayerConstraints[i].players.length < playerMin) throw "From __makeRolesFromARC__(): not enough players(=" + rolePlayerConstraints[i].players.length + ") to reach card-min(=" + playerMin + ") of roletype\"" + roleType.flatten()[0] + "\"!"; + for(var k = 0; k !== playerMin; ++k){ + // --- creates a new role + var selectedPlayers = new Array(); + for(var j = 0; j !== currentRoles.length; ++j) selectedPlayers.push(currentRoles[j].getPlayer()); + var currentPlayers = cleanPlayers(rolePlayerConstraints[i].players, selectedPlayers) + var cleanedPlayers = cleanPlayers(allAvailablePlayers, selectedPlayers); + cleanedPlayers = cleanPlayers(cleanedPlayers, currentPlayers); + cleanedPlayers = currentPlayers.concat(cleanedPlayers); + var role = new RoleC(null, roleType, cleanedPlayers, this.__arContainer__); this.__setRoleChangePlayerHandler__(role, this.__arContainer__.__frames__, rolePlayerConstraints, null); this.__setARCAddHandler__(role, associationRoleConstraint, rolePlayerConstraints[i]); this.__setARCRemoveHandler__(role, associationRoleConstraint, rolePlayerConstraints[i]); this.__error__.insert({"before" : role.getFrame()}); + // --- removes the new role's selected item from all other existing roles + for(var j = 0; j !== currentRoles.length; ++j){ + currentRoles[j].removePlayer(new Array(role.getPlayer())); + } ++rolesCreated; + currentRoles.push(role); } } @@ -1529,7 +1533,7 @@ } var role = new RoleC(null, roleType, cleanedPlayers, this.__arContainer__); - this.__checkARCButtons__(role, associationRoleConstraint, rolePlayerConstraints[i]); + currentRoles.push(role); this.__setRoleChangePlayerHandler__(role, this.__arContainer__.__frames__, rolePlayerConstraints, null); this.__setARCAddHandler__(role, associationRoleConstraint, rolePlayerConstraints[i]); this.__setARCRemoveHandler__(role, associationRoleConstraint, rolePlayerConstraints[i]); @@ -1539,7 +1543,10 @@ } } if(currentlyCreated === 0) throw "Not enough players to create all needed roles of the type \"" + roleType.flatten()[0] + "\"!"; - } + }; + this.__checkARCButtons__(currentRoles, allAvailablePlayers, associationRoleConstraint); + for(var i = 0; i !== currentRoles.length; ++i) + this.__setARCAddHandler__(currentRoles[i], allAvailablePlayers, associationRoleConstraint); }, "__makeRolesFromORC__" : function(roleType, player){ var orpcs = getOtherRoleConstraintsForRole(new Array(roleType), new Array(player), this.__otherRoleConstraints__); @@ -1606,50 +1613,23 @@ for(var i = 0; i !== existingRoles.length; ++i) existingRoles[i].hideRemoveButton(); } }, - "__checkARCButtons__" : function(role, arConstraint, rpConstraint){ - if(!role || !arConstraint || !rpConstraint) return; - - var roleMax = arConstraint.cardMax === "MAX_INT" ? "*" : parseInt(arConstraint.cardMax); - var playerMax = rpConstraint.cardMax === "MAX_INT" ? "*" : parseInt(rpConstraint.cardMax); - var playerMin = rpConstraint.cardMin === 0 ? 1 : parseInt(rpConstraint.cardMin); - var players = rpConstraint.players; - var existingRoles = this.getExistingRoles(arConstraint.roleType, rpConstraint.players, this.__arContainer__.__frames__); - var allExistingRoles = new Array(); - var tPsis = arConstraint.roleType.flatten(); - for(var i = 0; i !== this.__arContainer__.__frames__.length; ++i){ - if(tPsis.indexOf(this.__arContainer__.__frames__[i].getType()) !== -1) - allExistingRoles.push(this.__arContainer__.__frames__[i]); - } - var cleanedPlayers = new Array(); - for(var i = 0; i !== players.length; ++i){ - if(this.getExistingRoles(arConstraint.roleType, players[i], this.__arContainer__.__frames__).length === 0){ - cleanedPlayers.push(players[i]); - } - } - - // --- add button - if(cleanedPlayers.length !== 0 && playerMax > existingRoles.length && roleMax > allExistingRoles.length){ - for(var i = 0; i !== existingRoles.length; ++i) existingRoles[i].showAddButton(); + "__checkARCButtons__" : function(rolesToCheck, players, associationRoleConstraint){ + if(!rolesToCheck || !associationRoleConstraint) return; + var cardMin = associationRoleConstraint.cardMin === 0 ? 1 : parseInt(associationRoleConstraint.cardMin); + var cardMax = associationRoleConstraint.cardMax === "MAX_INT" ? "*" : parseInt(associationRoleConstraint.cardMax); + var lenPlayers = players ? players.length : 0; + if(cardMin < rolesToCheck.length) { + for(var i = 0; i !== rolesToCheck.length; ++i) rolesToCheck[i].showRemoveButton(); } else { - for(var i = 0; i !== existingRoles.length; ++i) existingRoles[i].hideAddButton(); + for(var i = 0; i !== rolesToCheck.length; ++i) rolesToCheck[i].hideRemoveButton(); } - // --- remove button - // --- If there is just one roleplayer-constraint to the passed roletype, there will be - // --- checked this card-min otherwise the minimum cardinality of this roletype and the - // --- players depending on the found roleplayer-constraints hast to exist only once. - // --- The defined cardinality will be cheched before committing, so the user will - // --- be warned before committing a bad fragment. - var foundRpcs = getRolePlayerConstraintsForRole(arConstraint.roleType, this.__rolePlayerConstraints__); - if(foundRpcs.length === 1 && playerMin < existingRoles.length){ - for(var i = 0; i !== existingRoles.length; ++i) existingRoles[i].showRemoveButton(); - } - else if(foundRpcs.length > 1 && existingRoles.length > 1){ - for(var i = 0; i !== existingRoles.length; ++i) existingRoles[i].showRemoveButton(); + if(cardMax > rolesToCheck.length && rolesToCheck.length < lenPlayers){ + for(var i = 0; i !== rolesToCheck.length; ++i) rolesToCheck[i].showAddButton(); } else { - for(var i = 0; i !== existingRoles.length; ++i) existingRoles[i].hideRemoveButton(); + for(var i = 0; i !== rolesToCheck.length; ++i) rolesToCheck[i].hideAddButton(); } }, "__setORCAddHandler__" : function(role, currentConstraint, constraints){ @@ -1741,11 +1721,39 @@ } } }, - "__setARCAddHandler__" : function(role, arConstraint, rpConstraint){ - if(!role || !arConstraint || !rpConstraint) return; + "__setARCAddHandler__" : function(role, players, associationRoleConstraint){ + if(!role || !associationRoleConstraint) return; + var lenPlayers = players ? players.length : 0; + var roleContainer = this; function addHandler(myself){ - //alert("myself: " + myself + "!!!"); + try{ + var roleType = associationRoleConstraint.roleType.flatten(); + var rolesToCheck = new Array(); + for(var i = 0; i !== roleContainer.__arContainer__.__frames__.length; ++i){ + if(roleType.indexOf(roleContainer.__arContainer__.__frames__[i].getType()) !== -1) + rolesToCheck.push(roleContainer.__arContainer__.__frames__[i]); + } + + // --- creates a new role + var cardMax = associationRoleConstraint.cardMax === "MAX_INT" ? "*" : parseInt(associationRoleConstraint.cardMax); + if(cardMax === "*" || cardMax > rolesToCheck.length){ + var usedPlayers = new Array(); + for(var i = 0; i !== rolesToCheck.length; ++i) usedPlayers.push(rolesToCheck[i].getPlayer()); + var cleanedPlayers = cleanPlayers(players ? players : new Array(), usedPlayers); + var role = new RoleC(null, roleType, cleanedPlayers, roleContainer.__arContainer__); + +//-----------------> + /*this.__setRoleChangePlayerHandler__(role, roleContainer.__arContainer__.__frames__, rolePlayerConstraints, null); + this.__setARCAddHandler__(role, associationRoleConstraint, rolePlayerConstraints[i]); + this.__setARCRemoveHandler__(role, associationRoleConstraint, rolePlayerConstraints[i]);*/ + roleContainer.__arContainer__.__frames__[roleContainer.__arContainer__.__frames__.length - 2].getFrame().insert({"after" : role.getFrame()}); + rolesToCheck.push(role); +// TODO: otherrole-constraints 1/3 + } + + roleContainer.__checkARCButtons__(rolesToCheck, players, associationRoleConstraint); + }catch(err){ alert("err: " + err); } } role.setAddHandler(addHandler); @@ -1754,7 +1762,8 @@ if(!role || !arConstraint || !rpConstraint) return; function removeHandler(myself){ - //alert("myself: " + myself + "!!!"); + alert("myself: " + myself + "!!!"); +// TODO: otherrole-constraints 2/3 } role.setRemoveHandler(removeHandler); @@ -1826,6 +1835,7 @@ existingRoles[i].removePlayer(playerToRemove); } } +// TODO: otherrole-constraints 3/3 }); } setEvent(this);

1 0

[isidorus-cvs] r36 - trunk/src/ajax/javascripts
by Lukas Giessmann 10 Jun '09

10 Jun '09

Author: lgiessmann Date: Wed Jun 10 09:21:22 2009 New Revision: 36 Log: ajax-client: added an "add" and an "remove" handler to the roles depending on otherrole-constraints Modified: trunk/src/ajax/javascripts/datamodel.js Modified: trunk/src/ajax/javascripts/datamodel.js ============================================================================== --- trunk/src/ajax/javascripts/datamodel.js (original) +++ trunk/src/ajax/javascripts/datamodel.js Wed Jun 10 09:21:22 2009 @@ -1270,12 +1270,11 @@ // --- representation of a role element. -var RoleC = Class.create(ContainerC, {"initialize" : function($super, itemIdentities, roleTypes, rolePlayers, owner, removeFunction, addFunction){ +var RoleC = Class.create(ContainerC, {"initialize" : function($super, itemIdentities, roleTypes, rolePlayers, owner){ $super(); if(!owner.__frames__) owner.__frames__ = new Array(); if(!roleTypes || roleTypes.length === 0) throw "From RoleC(): roleTypes must be set!"; if(!rolePlayers || rolePlayers.length === 0) throw "From RoleC(): rolePlayers must be set"; - if(!removeFunction || !addFunction) throw "From RoleC(): removeFunction and addFunction must be set!"; owner.__frames__.push(this); this.__frame__.writeAttribute({"class" : CLASSES.roleFrame()}); this.__table__ = new Element("table", {"class" : CLASSES.roleFrame()}); @@ -1288,23 +1287,16 @@ makeControlRow(this, 3, itemIdentities); // make control row have to be changed to a separate control row for roles checkRemoveAddButtons(owner, 1, -1); setRemoveAddHandler(this, owner, 1, -1, function(){ /*do nothing*/ }); - // --- resets the add and remove handlers + // --- gets the add and remove button var cTd = this.__table__.select("tr." + CLASSES.itemIdentityFrame())[0].select("td." + CLASSES.controlColumn())[0].select("span." + CLASSES.clickable()); - var removeButton = cTd[1]; - var addButton = cTd[2]; - removeButton.show(); - addButton.show(); - removeButton.stopObserving(); - addButton.stopObserving(); - removeButton.observe("click", removeFunction); - addButton.observe("click", addFunction); + this.__removeButton__ = cTd[1]; + this.__addButton__ = cTd[2]; // --- type var types = this.__roleTypes__.flatten(); this.__type__ = new Object(); var tr = newRow(CLASSES.typeFrame(), "Type", new SelectrowC(types, this.__type__, 1, 1).getFrame()); this.__table__.insert({"bottom" : tr}); - // TODO: implement a onTypeChangeHandler // --- player var players = this.__rolePlayers__.flatten(); @@ -1316,6 +1308,24 @@ alert("From RoleC(): " + err); } }, + "setAddHandler" : function(handler){ + if(!handler) return; + this.__addButton__.stopObserving(); + var addButton = this.__addButton__; + function addHandler(myself){ + addButton.observe("click", function(event){ handler(myself); }); + } + addHandler(this); + }, + "setRemoveHandler" : function(handler){ + if(!handler) return; + this.__removeButton__.stopObserving(); + var removeButton = this.__removeButton__; + function addHandler(myself){ + removeButton.observe("click", function(event){ handler(myself); }); + } + addHandler(this); + }, "addPlayer" : function(player){ if(!player || player.length === 0) return; var selected = this.getPlayer(); @@ -1416,21 +1426,6 @@ this.__frame__.writeAttribute({"class" : CLASSES.roleContainer()}); this.__arContainer__ = new Object(); this.__orContainer__ = new Object(); - /* - *associationrole-constraints: A association role constraint defines how many and of what type the roles in associations of given a type must be. - *min: card-min indicating the minimum number of times the role can appear in the association - *max: card-max indicating the maximum number of times the role can appear in the association - *roleplayer-constraints: A role player constraint defines a way to constrain the type of allowed role players of a given role with a given type - in an association of a given type. - *min: card-min indicating the minimum number of times a topic can play the role with the given type in the given - association of the given type - *max: card-max indicating the maximum number of times a topic can play the role with the given type in the given - association of the given type - *otherrole-constraints: A other role constraint defines a way to constrain the allowed type of role player given the existence of another role - player type in an association. - *min: card-min indicating the minimum number of times the other role can occur - *max: card-max indicating the maximum number of times the other role can occur - */ try{ if((!contents || contents.length === 0) && associationRoleConstraints){ this.resetValues(associationRoleConstraints, rolePlayerConstraints, otherRoleConstraints); @@ -1487,9 +1482,9 @@ var rolesCreated = 0; var allAvailablePlayers = extractPlayersOfConstraints(rolePlayerConstraints); var roleType = associationRoleConstraint.roleType; - var roleMin = associationRoleConstraint.cardMin; + var roleMin = associationRoleConstraint.cardMin === 0 ? 1 : parseInt(associationRoleConstraint.cardMin); for(var i = 0; i !== rolePlayerConstraints.length; ++i){ - var playerMin = rolePlayerConstraints[i].cardMin; + var playerMin = rolePlayerConstraints[i].cardMin === 0 ? 1 : parseInt(rolePlayerConstraints[i].cardMin); var currentAvailablePlayers = rolePlayerConstraints[i].players; var cleanedPlayers = cleanPlayers(allAvailablePlayers, currentAvailablePlayers); for(var j = playerMin; j < currentAvailablePlayers.length; ++j){ @@ -1497,13 +1492,14 @@ } if(currentAvailablePlayers.length < playerMin) throw "From __makeRolesFromARC__(): not enough players(=" + currentAvailablePlayers.length + ") to reach card-min(=" + playerMin + ") of roletype\"" + roleType.flatten()[0] + "\"!"; for(var j = 0; j !== playerMin; ++j){ - var removeFunction = function(event){ alert("removeFunction"); }; - var addFunction = function(event){ alert("addFunction"); }; var selectedPlayer = currentAvailablePlayers[j]; var _players = cleanedPlayers; _players.unshift(selectedPlayer); - var role = new RoleC(null, roleType, _players, this.__arContainer__, removeFunction, addFunction); + var role = new RoleC(null, roleType, _players, this.__arContainer__); + this.__checkARCButtons__(role, associationRoleConstraint, rolePlayerConstraints[i]); this.__setRoleChangePlayerHandler__(role, this.__arContainer__.__frames__, rolePlayerConstraints, null); + this.__setARCAddHandler__(role, associationRoleConstraint, rolePlayerConstraints[i]); + this.__setARCRemoveHandler__(role, associationRoleConstraint, rolePlayerConstraints[i]); this.__error__.insert({"before" : role.getFrame()}); ++rolesCreated; } @@ -1532,8 +1528,11 @@ this.__arContainer__.__frames__[j].removePlayer(cleanedPlayers[0]); } - var role = new RoleC(null, roleType, cleanedPlayers, this.__arContainer__, removeFunction, addFunction); + var role = new RoleC(null, roleType, cleanedPlayers, this.__arContainer__); + this.__checkARCButtons__(role, associationRoleConstraint, rolePlayerConstraints[i]); this.__setRoleChangePlayerHandler__(role, this.__arContainer__.__frames__, rolePlayerConstraints, null); + this.__setARCAddHandler__(role, associationRoleConstraint, rolePlayerConstraints[i]); + this.__setARCRemoveHandler__(role, associationRoleConstraint, rolePlayerConstraints[i]); this.__error__.insert({"before" : role.getFrame()}); ++rolesCreated; ++currentlyCreated; @@ -1544,14 +1543,12 @@ }, "__makeRolesFromORC__" : function(roleType, player){ var orpcs = getOtherRoleConstraintsForRole(new Array(roleType), new Array(player), this.__otherRoleConstraints__); - var removeFunction = function(event){ alert("removeFunction"); }; - var addFunction = function(event){ alert("addFunction"); }; for(var i = 0; i !== orpcs.length; ++i){ var cPlayers = orpcs[i].players; var cRoleType = orpcs[i].roleType; var cOtherPlayers = orpcs[i].otherPlayers; var cOtherRoleType = orpcs[i].otherRoleType; - var cMin = parseInt(orpcs[i].cardMin); + var cMin = orpcs[i].cardMin === 0 ? 1 : parseInt(orpcs[i].cardMin); if(!cOtherPlayers || cOtherPlayers.length < cMin) throw "from __makeRolesFromORC__(): not enough players(=" + cOtherPlayers.length + ") for roletype + \"" + cOtherRoleType.flatten()[0] + "\"!"; var existingRoles = this.getExistingRoles(cOtherRoleType, cOtherPlayers, this.__orContainer__.__frames__); for(var j = 0; j < cMin - existingRoles.length; ++j){ @@ -1570,12 +1567,198 @@ this.__orContainer__.__frames__[j].removePlayer(cleanedPlayers[0]); } - var role = new RoleC(null, cOtherRoleType, cleanedPlayers, this.__orContainer__, removeFunction, addFunction); + var role = new RoleC(null, cOtherRoleType, cleanedPlayers, this.__orContainer__); + this.__checkORCButtons__(role, orpcs[i]); this.__setRoleChangePlayerHandler__(role, this.__orContainer__.__frames__, null, orpcs); + this.__setORCAddHandler__(role, orpcs[i], orpcs); + this.__setORCRemoveHandler__(role, orpcs[i], orpcs); this.__error__.insert({"before" : role.getFrame()}); } } }, + "__checkORCButtons__" : function(role, constraint){ + if(!role || !constraint) return; + var cOtherPlayers = constraint.otherPlayers; + var cOtherRoleType = constraint.otherRoleType; + var cardMax = constraint.cardMax === "MAX_INT" ? "*" : parseInt(constraint.cardMax); + var cardMin = parseInt(constraint.cardMin); + var existingRoles = this.getExistingRoles(cOtherRoleType, cOtherPlayers, this.__orContainer__.__frames__); + var cleanedPlayers = new Array(); + for(var i = 0; i !== cOtherPlayers.length; ++i){ + if(this.getExistingRoles(cOtherRoleType, cOtherPlayers[i], this.__orContainer__.__frames__).length === 0){ + cleanedPlayers.push(cOtherPlayers[i]); + } + } + + // --- add button + if(cardMax > existingRoles.length && cleanedPlayers.length !== 0){ + for(var i = 0; i !== existingRoles.length; ++i) existingRoles[i].showAddButton(); + } + else { + for(var i = 0; i !== existingRoles.length; ++i) existingRoles[i].hideAddButton(); + } + + // --- remove button + if(cardMin > existingRoles.length){ + for(var i = 0; i !== existingRoles.length; ++i) existingRoles[i].showRemoveButton(); + } + else { + for(var i = 0; i !== existingRoles.length; ++i) existingRoles[i].hideRemoveButton(); + } + }, + "__checkARCButtons__" : function(role, arConstraint, rpConstraint){ + if(!role || !arConstraint || !rpConstraint) return; + + var roleMax = arConstraint.cardMax === "MAX_INT" ? "*" : parseInt(arConstraint.cardMax); + var playerMax = rpConstraint.cardMax === "MAX_INT" ? "*" : parseInt(rpConstraint.cardMax); + var playerMin = rpConstraint.cardMin === 0 ? 1 : parseInt(rpConstraint.cardMin); + var players = rpConstraint.players; + var existingRoles = this.getExistingRoles(arConstraint.roleType, rpConstraint.players, this.__arContainer__.__frames__); + var allExistingRoles = new Array(); + var tPsis = arConstraint.roleType.flatten(); + for(var i = 0; i !== this.__arContainer__.__frames__.length; ++i){ + if(tPsis.indexOf(this.__arContainer__.__frames__[i].getType()) !== -1) + allExistingRoles.push(this.__arContainer__.__frames__[i]); + } + var cleanedPlayers = new Array(); + for(var i = 0; i !== players.length; ++i){ + if(this.getExistingRoles(arConstraint.roleType, players[i], this.__arContainer__.__frames__).length === 0){ + cleanedPlayers.push(players[i]); + } + } + + // --- add button + if(cleanedPlayers.length !== 0 && playerMax > existingRoles.length && roleMax > allExistingRoles.length){ + for(var i = 0; i !== existingRoles.length; ++i) existingRoles[i].showAddButton(); + } + else { + for(var i = 0; i !== existingRoles.length; ++i) existingRoles[i].hideAddButton(); + } + + // --- remove button + // --- If there is just one roleplayer-constraint to the passed roletype, there will be + // --- checked this card-min otherwise the minimum cardinality of this roletype and the + // --- players depending on the found roleplayer-constraints hast to exist only once. + // --- The defined cardinality will be cheched before committing, so the user will + // --- be warned before committing a bad fragment. + var foundRpcs = getRolePlayerConstraintsForRole(arConstraint.roleType, this.__rolePlayerConstraints__); + if(foundRpcs.length === 1 && playerMin < existingRoles.length){ + for(var i = 0; i !== existingRoles.length; ++i) existingRoles[i].showRemoveButton(); + } + else if(foundRpcs.length > 1 && existingRoles.length > 1){ + for(var i = 0; i !== existingRoles.length; ++i) existingRoles[i].showRemoveButton(); + } + else { + for(var i = 0; i !== existingRoles.length; ++i) existingRoles[i].hideRemoveButton(); + } + }, + "__setORCAddHandler__" : function(role, currentConstraint, constraints){ + if(!role || !currentConstraint || !constraints || constraints.length === 0) return; + + var roleContainer = this; + function addHandler(myself){ + var cOtherPlayers = currentConstraint.otherPlayers; + var cOtherRoleType = currentConstraint.otherRoleType; + var cardMax = currentConstraint.cardMax === "MAX_INT" ? "*" : parseInt(currentConstraint.cardMax); + var cardMin = currentConstraint.cardMin === 0 ? 1 : parseInt(currentConstraint.cardMin); + var existingRoles = roleContainer.getExistingRoles(cOtherRoleType, cOtherPlayers, roleContainer.__orContainer__.__frames__); + var cleanedPlayers = new Array(); + for(var i = 0; i !== cOtherPlayers.length; ++i){ + if(roleContainer.getExistingRoles(cOtherRoleType, cOtherPlayers[i], roleContainer.__orContainer__.__frames__).length === 0){ + cleanedPlayers.push(cOtherPlayers[i]); + } + } + + // --- creates new role + if(cleanedPlayers.length !== 0){ + var role = new RoleC(null, cOtherRoleType, cleanedPlayers, roleContainer.__orContainer__); + roleContainer.__checkORCButtons__(role, currentConstraint); + roleContainer.__setRoleChangePlayerHandler__(role, roleContainer.__orContainer__.__frames__, null, constraints); + roleContainer.__setORCAddHandler__(role, currentConstraint, constraints); + roleContainer.__setORCRemoveHandler__(role, currentConstraint, constraints); + roleContainer.__error__.insert({"before" : role.getFrame()}); + // --- removes the selected player from all other roles + for(var i = 0; i !== existingRoles.length; ++i){ + existingRoles[i].removePlayer(new Array(role.getPlayer())); + } + var allRoles = existingRoles; + allRoles.push(role); + roleContainer.__innerCheckORCButtons__(allRoles, cardMin, cardMax); + } + } + + role.setAddHandler(addHandler); + }, + "__setORCRemoveHandler__" : function(role, currentConstraint, constraints){ + if(!role || !currentConstraint || !constraints) return; + + var roleContainer = this; + function removeHandler(myself){ + var cOtherPlayers = currentConstraint.otherPlayers; + var cOtherRoleType = currentConstraint.otherRoleType; + var cardMax = currentConstraint.cardMax === "MAX_INT" ? "*" : parseInt(currentConstraint.cardMax); + var cardMin = currentConstraint.cardMin === 0 ? 1 : parseInt(currentConstraint.cardMin); + var playerToAdd = null; + for(var i = 0; i !== cOtherPlayers.length; ++i){ + if(cOtherPlayers[i].indexOf(role.getPlayer()) !== -1){ + playerToAdd = cOtherPlayers[i]; + } + } + roleContainer.__orContainer__.__frames__ = roleContainer.__orContainer__.__frames__.without(role); + role.remove(); + var existingRoles = roleContainer.getExistingRoles(cOtherRoleType, cOtherPlayers, roleContainer.__orContainer__.__frames__); + for(var i = 0; i !== existingRoles.length; ++i){ + existingRoles[i].addPlayer(playerToAdd); + } + roleContainer.__innerCheckORCButtons__(existingRoles, cardMin, cardMax); + } + + role.setRemoveHandler(removeHandler); + }, + "__innerCheckORCButtons__" : function(existingRoles, cardMin, cardMax){ + if(!existingRoles) return; + + // --- checks all control buttons after an add or remove operation + if(cardMax !== "*" && existingRoles.length >= cardMax){ + for(var i = 0; i !== existingRoles.length; ++i){ + existingRoles[i].hideAddButton(); + } + } + else { + for(var i = 0; i !== existingRoles.length; ++i){ + existingRoles[i].showAddButton(); + } + } + + if(cardMin < existingRoles.length){ + for(var i = 0; i !== existingRoles.length; ++i){ + existingRoles[i].showRemoveButton(); + } + } + else { + for(var i = 0; i !== existingRoles.length; ++i){ + existingRoles[i].hideRemoveButton(); + } + } + }, + "__setARCAddHandler__" : function(role, arConstraint, rpConstraint){ + if(!role || !arConstraint || !rpConstraint) return; + + function addHandler(myself){ + //alert("myself: " + myself + "!!!"); + } + + role.setAddHandler(addHandler); + }, + "__setARCRemoveHandler__" : function(role, arConstraint, rpConstraint){ + if(!role || !arConstraint || !rpConstraint) return; + + function removeHandler(myself){ + //alert("myself: " + myself + "!!!"); + } + + role.setRemoveHandler(removeHandler); + }, "getExistingRoles" : function(roleType, players, roles){ var rolesFound = new Array(); if(!roles || roles.length === 0) return rolesFound; @@ -1782,6 +1965,7 @@ }}); +// --- contains all fragment's associations depending on the main topic var AssociationContainerC = Class.create(ContainerC, {"initialize" : function($super, contents, constraints, mainTopic){ $super(); this.__minimized__ = false;

1 0

[isidorus-cvs] r35 - in trunk: docs src/ajax/javascripts src/json
by Lukas Giessmann 10 Jun '09

10 Jun '09

Author: lgiessmann Date: Wed Jun 10 03:15:18 2009 New Revision: 35 Log: ajax-client: fixed some problems in the onPlayerChangeHandler and added the possibility to use the new created topic as a player in associations which allows it Modified: trunk/docs/xtm_json.txt trunk/src/ajax/javascripts/constants.js trunk/src/ajax/javascripts/create.js trunk/src/ajax/javascripts/datamodel.js trunk/src/ajax/javascripts/tmcl_tools.js trunk/src/json/json_tmcl.lisp Modified: trunk/docs/xtm_json.txt ============================================================================== --- trunk/docs/xtm_json.txt (original) +++ trunk/docs/xtm_json.txt Wed Jun 10 03:15:18 2009 @@ -322,7 +322,7 @@ //+ in an association of a certain associationtype (the objects owner). //+----------------------------------------------------------------------------- { - "roleType" : [ [ "topic-psi-1", "topic-psi-2", "..." ], ["subtype-1-psi-1", "..."], <...> ], + "roleType" : [ [ "topic-psi-1", "topic-psi-2", "..." ], [ "subtype-1-psi-1", "..."], <...> ], "cardMin" : "unsigned integer in string representation", "cardMax" : "unsigned integer in string representation or the string MAX_INT" } @@ -340,7 +340,8 @@ //+ association of a given type (= objects owner). //+----------------------------------------------------------------------------- { - "players" : [ [ "topic-psi-1", "topic-psi-2", "..." ], [ "topic-2-psi-1", "..."], <...> ] + "playerType" : [ [ "topic-psi-1", "topic-psi-2", "..." ], [ "subtype-1-psi-1", "..." ], <...> ], + "players" : [ [ "topic-psi-1", "topic-psi-2", "..." ], [ "topic-2-psi-1", "..."], <...> ], "roleType" : [ [ "topic-psi-1", "topic-psi-2", "..." ], [ "subtype-psi-1", "..." ], <...> ], "cardMin" : "unsigned integer in string representation", "cardMax" : "unsigned integer in string representation or the string MAX_INT" @@ -356,8 +357,10 @@ //+ The values cardMin and cardMax defines the cardinality of otherRoleType. //+----------------------------------------------------------------------------- { + "playerType" : [ [ "topic-psi-1", "topic-psi-2", "..." ], [ "subtype-1-psi-1", "..." ], <...> ], "players" : [ [ "topic-psi-1", "topic-psi-2", "..." ], [ "topic-2-psi-1", "..."], <...> ] ], "roleType" : [ [ "topic-psi-1", "topic-psi-2", "..." ], [ "subtype-psi-1", "..." ], <...> ], + "otherPlayerType" : [ [ "topic-psi-1", "topic-psi-2", "..." ], [ "subtype-1-psi-1", "..." ], <...> ], "otherPlayers" : [ "topic-psi-1", "topic-psi-2", "..." ], [ "topic-2-psi-1", "..."], <...> ] ], "otherRoleType" : [ "topic-psi-1", "topic-psi-2", "..." ], [ "subtype-psi-1", "..." ], <...> ], "cardMin" : "unsigned integer in string representation", Modified: trunk/src/ajax/javascripts/constants.js ============================================================================== --- trunk/src/ajax/javascripts/constants.js (original) +++ trunk/src/ajax/javascripts/constants.js Wed Jun 10 03:15:18 2009 @@ -30,6 +30,7 @@ var ANY_URI = "http://www.w3.org/2001/XMLSchema#anyURI"; var STRING = "http://www.w3.org/2001/XMLSchema#string"; +var CURRENT_TOPIC = "**current-topic**"; // --- Contains most css classes used in this project // --- There should be called only the function to be sure to don't override Modified: trunk/src/ajax/javascripts/create.js ============================================================================== --- trunk/src/ajax/javascripts/create.js (original) +++ trunk/src/ajax/javascripts/create.js Wed Jun 10 03:15:18 2009 @@ -36,11 +36,16 @@ items[i].remove(); } - var topic = new TopicC(null, (constraints ? constraints.topicConstraints : null)); + var instanceOfs = new Array(); + for(var i = 0; psis && i !== psis.length; ++i){ + instanceOfs.push(new Array(psis[i])); + } + var topic = new TopicC(null, (constraints ? constraints.topicConstraints : null), instanceOfs); var liT = new Element("li", {"class" : CLASSES.topicFrame()}).update(topic.getFrame()); context.insert({"after" : liT}); - var associations = new AssociationContainerC(null, (constraints ? constraints.associationsConstraints : null)); + addTopicAsPlayer((constraints ? constraints.associationsConstraints : null), topic.getContent().instanceOfs); + var associations = new AssociationContainerC(null, (constraints ? constraints.associationsConstraints : null), topic); var liA = new Element("li", {"class" : CLASSES.associationContainer()}).update(associations.getFrame()); liT.insert({"after" : liA}); } Modified: trunk/src/ajax/javascripts/datamodel.js ============================================================================== --- trunk/src/ajax/javascripts/datamodel.js (original) +++ trunk/src/ajax/javascripts/datamodel.js Wed Jun 10 03:15:18 2009 @@ -243,7 +243,8 @@ myself.showError(str); } else { - successFun(contents, json); + //successFun(contents, json); + successFun(myself.getContent(true, true), json); } } @@ -1163,9 +1164,10 @@ // --- representation of a topic element. -var TopicC = Class.create(ContainerC, {"initialize" : function($super, content, constraints){ +var TopicC = Class.create(ContainerC, {"initialize" : function($super, content, constraints, instanceOfs){ $super(); this.__minimized__ = false; + this.__instanceOfs__ = (!instanceOfs || instanceOfs.length === 0 ? null : instanceOfs); try{ this.__frame__ .writeAttribute({"class" : CLASSES.topicFrame()}); this.__table__ = new Element("table", {"class" : CLASSES.topicFrame()}); @@ -1226,6 +1228,7 @@ "itemIdentities" : this.__itemIdentity__.getContent(true, true), "subjectLocators" : this.__subjectLocator__.getContent(true, true), "subjectIdentifiers" : this.__subjectIdentifier__.getContent(true, true), + "instanceOfs" : this.__instanceOfs__, "names" : this.__name__.getContent(), "occurrences" : this.__occurrence__.getContent()}; } @@ -1239,6 +1242,7 @@ ",\"itemIdentities\":" + this.__itemIdentity__.toJSON(true, true) + ",\"subjectLocators\":" + this.__subjectLocator__.toJSON(true, true) + ",\"subjectIdentifiers\":" + this.__subjectIdentifier__.toJSON(true, true) + + ",\"instanceOfs\":" + (!this.__instanceOfs__ ? "null" : this.__instanceOfs__.toJSON()) + ",\"names\":" + this.__name__.toJSON() + ",\"occurrences\":" + this.__occurrence__.toJSON() + "}"; } @@ -1259,6 +1263,9 @@ else rows[i].show(); } this.__minimized__ = !this.__minimized__; + }, + "hasPsi" : function(){ + return this.__subjectIdentifier__.getContent(true, true).length !== 0; }}); @@ -1311,7 +1318,7 @@ }, "addPlayer" : function(player){ if(!player || player.length === 0) return; - var selected = this.__player__.__frames__[0].getContent(); + var selected = this.getPlayer(); var select = this.__player__.__frames__[0].getFrame().select("select")[0]; select.update(""); if(this.__rolePlayers__){ @@ -1338,6 +1345,7 @@ select.insert({"bottom" : opt}); } else { + opt.writeAttribute({"selected" : "selected"}); select.insert({"top" : opt}); } } @@ -1345,7 +1353,7 @@ }, "removePlayer" : function(player){ if(!player || player.length === 0 || !this.__rolePlayers__ || this.__rolePlayers__.length === 0) return; - var selected = this.__player__.__frames__[0].getContent(); + var selected = this.getPlayer(); var select = this.__player__.__frames__[0].getFrame().select("select")[0]; select.update(""); var j = 0; @@ -1364,6 +1372,7 @@ select.insert({"bottom" : opt}); } else { + opt.writeAttribute({"selected" : "selected"}); select.insert({"top" : opt}); } } @@ -1773,9 +1782,10 @@ }}); -var AssociationContainerC = Class.create(ContainerC, {"initialize" : function($super, contents, constraints){ +var AssociationContainerC = Class.create(ContainerC, {"initialize" : function($super, contents, constraints, mainTopic){ $super(); this.__minimized__ = false; + this.__mainTopic__ = mainTopic; try{ this.__frame__ .writeAttribute({"class" : CLASSES.associationContainer()}); this.__table__ = new Element("table", {"class" : CLASSES.associationContainer()}); @@ -1808,17 +1818,18 @@ }); } setMinimizeHandler(this); -/* + var button = new Element("input", {"type" : "button", "value" : "toJSON()"}); function test(myself){ button.observe("click", function(event){ + try{ alert("content:\n\n" + myself.getContent()); - alert("JSON:\n\n" + myself.toJSON()); + alert("JSON:\n\n" + myself.toJSON().gsub("\"topicRef\":\\[\"\\*\\*current-topic\\*\\*\"\\]", myself.__mainTopic__.getContent().subjectIdentifiers.toJSON())); + }catch(err){ alert("test: " + err); } }); } test(this); this.getFrame().insert({"bottom" : button}); -*/ } catch(err){ alert("From AssociationContainerC(): " + err); Modified: trunk/src/ajax/javascripts/tmcl_tools.js ============================================================================== --- trunk/src/ajax/javascripts/tmcl_tools.js (original) +++ trunk/src/ajax/javascripts/tmcl_tools.js Wed Jun 10 03:15:18 2009 @@ -152,12 +152,6 @@ if(rpMax !== "*" && rpMax < arMin) throw "Not enough players available for roletype \"" + type + "\" (rpMax=" + rpMax + ", arMin=" + arMin + ")"; if(arMax !== "*" && rpMin > arMax) throw "Too much players for the roletype \"" + type + "\" (rpMin=" + rpMin + ", arMax=" + arMax + ")"; - /* - if(rpMin < arMin) throw "sum of card-min(=" + rpMin + ") of all roleplayer-constraints < card-min(=" + arMin + ") of associationrole-constraint for the role \"" + type + "\"! not enough players"; - if(arMax !== "*" && (rpMax === "*" || rpMax > arMax)) throw "sum of card-max(=" + rpMax + ") of all roleplayer-constraints > card-max(=" + arMax + ") of associationrole-constraint for the role \"" + type + "\"! too much players" - if(arMax !== "*" && rpMin > arMax) throw "sum of card-min(=" + rpMin + ") of all roleplayer-constraints > card-max(=" + arMax + ") of associationrole-constraint for the role \"" + type + "\"! too much players"; - if(rpMax !== "*" && rpMax < arMin) throw "sum of card-max(=" + rpMax + ") of all roleplayer-constraints > card-min(=" + arMin + ") of associationrole-constraint for the role \"" + type + "\"! not enough players"; - */ } @@ -199,4 +193,51 @@ if(toDel === false) cleanedPlayers.push(allPlayers[i]); } return cleanedPlayers; +} + + +// --- Ads the new created topic as a player to all association constraints +// --- where the player-type is one of the topic's instanceOf-topics. +function addTopicAsPlayer(associationsConstraints, topicInstanceOfs){ + if(!associationsConstraints || associationsConstraints.length === 0 || !topicInstanceOfs || topicInstanceOfs.length === 0) return; + var instanceOfsPsis = topicInstanceOfs.flatten(); + for(var i = 0; i !== associationsConstraints.length; ++i){ + // --- associationrole-constraints + if(associationsConstraints[i].rolePlayerConstraints){ + rpcs = associationsConstraints[i].rolePlayerConstraints; + for(var j = 0; j !== rpcs.length; ++j){ + for(var k = 0; k !== rpcs[j].playerType.length; ++k){ + for(var l = 0; l !== rpcs[j].playerType[k].length; ++l){ + if(instanceOfsPsis.indexOf(rpcs[j].playerType[k][l]) !== -1){ + rpcs[j].players.push(new Array(CURRENT_TOPIC)); + break; + } + } + } + } + } + + // --- otherrole-constraints + if(associationsConstraints[i].otherRoleConstraints){ + orcs = associationsConstraints[i].otherRoleConstraints; + for(var j = 0; j !== orcs.length; ++j){ + for(var k = 0; k !== orcs[j].playerType.length; ++k){ + for(var l = 0; l !== orcs[j].playerType[k].length; ++l){ + if(instanceOfsPsis.indexOf(orcs[j].playerType[k][l]) !== -1){ + orcs[j].players.push(new Array(CURRENT_TOPIC)); + break; + } + } + } + for(var k = 0; k !== orcs[j].otherPlayerType.length; ++k){ + for(var l = 0; l !== orcs[j].otherPlayerType[k].length; ++l){ + if(instanceOfsPsis.indexOf(orcs[j].otherPlayerType[k][l]) !== -1){ + orcs[j].otherPlayers.push(new Array(CURRENT_TOPIC)); + break; + } + } + } + } + } + } } \ No newline at end of file Modified: trunk/src/json/json_tmcl.lisp ============================================================================== --- trunk/src/json/json_tmcl.lisp (original) +++ trunk/src/json/json_tmcl.lisp Wed Jun 10 03:15:18 2009 @@ -187,7 +187,10 @@ (uri (first (psis (getf involved-topic-tupple :otherrole)))) constraint-lists)) - (let ((json-player + (let ((json-player-type + (concatenate 'string "\"playerType\":" + (topics-to-json-list (getf (list-subtypes (getf involved-topic-tupple :player) nil nil) :subtypes)))) + (json-player (concatenate 'string "\"players\":" (topics-to-json-list (list-instances (getf involved-topic-tupple :player) topictype topictype-constraint)))) @@ -195,6 +198,9 @@ (concatenate 'string "\"roleType\":" (topics-to-json-list (getf (list-subtypes (getf involved-topic-tupple :role) roletype roletype-constraint) :subtypes)))) + (json-otherplayer-type + (concatenate 'string "\"otherPlayerType\":" + (topics-to-json-list (getf (list-subtypes (getf involved-topic-tupple :otherplayer) nil nil) :subtypes)))) (json-otherplayer (concatenate 'string "\"otherPlayers\":" (topics-to-json-list @@ -209,7 +215,7 @@ (concatenate 'string "\"cardMax\":" (getf (first constraint-lists) :card-max)))) (setf cleaned-otherrole-constraints (concatenate 'string cleaned-otherrole-constraints - "{" json-player "," json-role "," json-otherplayer "," json-otherrole "," card-min "," card-max "},"))))) + "{" json-player-type "," json-player "," json-role "," json-otherplayer-type "," json-otherplayer "," json-otherrole "," card-min "," card-max "},"))))) (if (string= cleaned-otherrole-constraints "[") (setf cleaned-otherrole-constraints "null") (setf cleaned-otherrole-constraints @@ -272,7 +278,6 @@ :test #'(lambda(x y) (and (eq (getf x :player) (getf y :player)) (eq (getf x :role) (getf y :role))))))) - (let ((cleaned-roleplayer-constraints "[")) (loop for role-player-tupple in role-player-tupples do (let ((constraint-lists @@ -286,7 +291,10 @@ (uri (first (psis (getf role-player-tupple :role)))) (uri (first (psis (getf role-player-tupple :player)))) constraint-lists)) - (let ((json-players + (let ((json-player-type + (concatenate 'string "\"playerType\":" + (topics-to-json-list (getf (list-subtypes (getf role-player-tupple :player) nil nil) :subtypes)))) + (json-players (concatenate 'string "\"players\":" (topics-to-json-list (list-instances (getf role-player-tupple :player) topictype topictype-constraint)))) @@ -300,7 +308,7 @@ (concatenate 'string "\"cardMax\":" (getf (first constraint-lists) :card-max)))) (setf cleaned-roleplayer-constraints (concatenate 'string cleaned-roleplayer-constraints - "{" json-players "," json-role "," card-min "," card-max "},"))))) + "{" json-player-type "," json-players "," json-role "," card-min "," card-max "},"))))) (if (string= cleaned-roleplayer-constraints "[") (setf cleaned-roleplayer-constraints "null") (setf cleaned-roleplayer-constraints

1 0