Merge pull request #116 from marklogic-community/feature-111

Feature 111

Author: eouthwaite

rest-api/ext/process.xqy

@@ -150,21 +150,23 @@ function ext:post(
    $params  as map:map,
    $input   as document-node()*
 ) as document-node()* {
+  let $_ := xdmp:log(fn:concat("REST EXT params=", xdmp:quote($params)), "debug")
+  let $preftype := if ("application/xml" = map:get($context,"accept-types")) then "application/xml" else "application/json"
+  let $_ := xdmp:log(fn:concat("REST EXT preftype: " , $preftype), "debug")
+
+  let $part := (map:get($params,"part"),"document")[1]
+  let $_ := xdmp:log(fn:concat("REST EXT part: ", $part), "debug")
 
- let $preftype := if ("application/xml" = map:get($context,"accept-types")) then "application/xml" else "application/json"
+  let $_ := xdmp:log(fn:concat("REST EXT input: ", $input), "debug")
+  let $pid := map:get($params,"processid") (: this is stripping the '+' symbol if sent unencoded :)
+  (:let $proc := wfu:get($pid):)
+  let $_ := xdmp:log(fn:concat("REST EXT ProcessId: ", $pid), "debug")
+  let $props := wfu:getProperties($pid)
 
- let $part := (map:get($params,"part"),"document")[1]
+  let $_ := xdmp:log("CURRENT STEP INFO", "debug")
+  let $_ := xdmp:log($props (: /wf:currentStep :) , "debug")
 
- let $_ := xdmp:log($input)
- let $pid := map:get($params,"processid")
- (:let $proc := wfu:get($pid):)
- let $_ := xdmp:log("REST EXT ProcessId: " || $pid)
- let $props := wfu:getProperties($pid)
- (:
- let $_ := xdmp:log("CURRENT STEP INFO")
- let $_ := xdmp:log($props/wf:currentStep)
- :)
- let $res :=
+  let $res :=
    if ("true" = map:get($params,"complete")) then
      (: sanity check that the specified process' status is on a user task :)
      if ("userTask" = $props/wf:currentStep/wf:step-type) then
@@ -187,6 +189,7 @@ function ext:post(
 
      if ("true" = map:get($params,"lock")) then
        (: Lock the work item, and return its details as if get had been called. If already locked, instead return an error :)
+       let $_ := xdmp:log("REST EXT call to lock work item", "debug")
        let $feedback := wfu:lock($pid)
        let $update :=
          if (fn:empty($feedback)) then

src/app/models/workflow-util.xqy

@@ -281,6 +281,8 @@ declare function m:lock($processId as xs:string) as xs:string? {
   (: when it works, should return empty-sequence() :)
   (: Check that this is a human queue task or user task :)
   let $props := m:getProperties($processId)
+  let $_ := xdmp:log(fn:concat("WF Utils lock pid=", $processId), "debug")
+  let $_ := xdmp:log(fn:concat("WF Utils props=", xdmp:quote($props)), "debug")
   return
     if ($props/wf:currentStep/wf:step-type = "userTask" and $props/wf:currentStep/wf:step-status = "ENTERED") then
       if ($props/wf:currentStep/wf:type = "user" or $props/wf:currentStep/wf:type = "queue" or $props/wf:currentStep/wf:type = "role") then

src/test/css/jquery.gritter.css

@@ -0,0 +1,89 @@
+/* the norm */
+#gritter-notice-wrapper {
+	position:fixed;
+	top:20px;
+	right:20px;
+	width:301px;
+	z-index:9999;
+}
+#gritter-notice-wrapper.top-left {
+    left: 20px;
+    right: auto;
+}
+#gritter-notice-wrapper.bottom-right {
+    top: auto;
+    left: auto;
+    bottom: 20px;
+    right: 20px;
+}
+#gritter-notice-wrapper.bottom-left {
+    top: auto;
+    right: auto;
+    bottom: 20px;
+    left: 20px;
+}
+.gritter-item-wrapper {
+	position:relative;
+	margin:0 0 10px 0;
+	background:url('../img/ie-spacer.gif'); /* ie7/8 fix */ 
+}
+.gritter-top {
+	background:url(../img/gritter.png) no-repeat left -30px;
+	height:10px;
+}
+.hover .gritter-top {
+	background-position:right -30px;
+}
+.gritter-bottom {
+	background:url(../img/gritter.png) no-repeat left bottom;
+	height:8px;
+	margin:0;
+}
+.hover .gritter-bottom {
+	background-position: bottom right;
+}
+.gritter-item {
+	display:block;
+	background:url(../img/gritter.png) no-repeat left -40px;
+	color:#eee;
+	padding:2px 11px 8px 11px;
+	font-size: 11px;
+	font-family:verdana;
+}
+.hover .gritter-item {
+	background-position:right -40px;
+}
+.gritter-item p {
+	padding:0;
+	margin:0;
+}
+.gritter-close {
+	display:none;
+	position:absolute;
+	top:5px;
+	left:3px;
+	background:url(../img/gritter.png) no-repeat left top;
+	cursor:pointer;
+	width:30px;
+	height:30px;
+}
+.gritter-title {
+	font-size:14px;
+	font-weight:bold;
+	padding:0 0 7px 0;
+	display:block;
+	text-shadow:1px 1px #000; /* Not supported by IE :( */
+}
+.gritter-image {
+	width:48px;
+	height:48px;
+	float:left;
+}
+.gritter-with-image,
+.gritter-without-image {
+	padding:0 0 5px 0;
+}
+.gritter-with-image {
+	width:220px;
+	float:right;
+}