Menu
▾
▴
tolven-cvs-commit — Tolven CVS Commit
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(141) |
Sep
(184) |
Oct
(159) |
Nov
(77) |
Dec
(114) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(212) |
Feb
(302) |
Mar
(323) |
Apr
(360) |
May
(302) |
Jun
(392) |
Jul
(299) |
Aug
(858) |
Sep
(499) |
Oct
(489) |
Nov
(324) |
Dec
(438) |
| 2008 |
Jan
(449) |
Feb
(388) |
Mar
(811) |
Apr
(583) |
May
(949) |
Jun
(1431) |
Jul
(943) |
Aug
(527) |
Sep
(576) |
Oct
(440) |
Nov
(1046) |
Dec
(658) |
| 2009 |
Jan
(259) |
Feb
(192) |
Mar
(495) |
Apr
(2322) |
May
(2023) |
Jun
(1387) |
Jul
(722) |
Aug
(771) |
Sep
(167) |
Oct
(142) |
Nov
(384) |
Dec
(884) |
| 2010 |
Jan
(344) |
Feb
(82) |
Mar
(248) |
Apr
(341) |
May
(389) |
Jun
(289) |
Jul
(19) |
Aug
(478) |
Sep
(274) |
Oct
(431) |
Nov
(322) |
Dec
(207) |
| 2011 |
Jan
(125) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: John C. <jc...@us...> - 2007-03-12 08:46:39
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29442/src/org/tolven/web Modified Files: MenuAction.java TolvenContext.java TRIMAction.java Log Message: Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary. Index: TolvenContext.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TolvenContext.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TolvenContext.java 8 Mar 2007 17:07:23 -0000 1.2 --- TolvenContext.java 12 Mar 2007 08:46:38 -0000 1.3 *************** *** 87,91 **** System.out.println( "One Time Initialization"); initializeAccountTypes(); ! trimBean.loadTrim(Thread.currentThread().getContextClassLoader().getResource("trim")); initialized = true; } --- 87,91 ---- System.out.println( "One Time Initialization"); initializeAccountTypes(); ! trimBean.loadAllTRIM(); initialized = true; } Index: MenuAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/MenuAction.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** MenuAction.java 28 Feb 2007 07:04:30 -0000 1.37 --- MenuAction.java 12 Mar 2007 08:46:38 -0000 1.38 *************** *** 53,56 **** --- 53,57 ---- import org.tolven.app.entity.MenuStructure; import org.tolven.ccr.ContinuityOfCareRecord; + import org.tolven.core.entity.Status; import org.tolven.core.util.Queuer; import org.tolven.doc.DocumentLocal; *************** *** 87,90 **** --- 88,92 ---- protected DocumentLocal documentLocal; protected XMLProtectedLocal xmlProtectedLocal; + protected XMLLocal xmlLocal; protected CreatorLocal creatorBean; private String givenName; *************** *** 103,106 **** --- 105,109 ---- documentLocal = (DocumentLocal) ctx.lookup("tolven/DocumentBean/local"); xmlProtectedLocal = (XMLProtectedLocal) ctx.lookup("tolven/XMLProtectedBean/local"); + xmlLocal = (XMLLocal) ctx.lookup("tolven/XMLBean/local"); } *************** *** 191,194 **** --- 194,198 ---- element = params.get("element"); } + // System.out.println( "getElement: " + element); return element; } Index: TRIMAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TRIMAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TRIMAction.java 12 Feb 2007 07:09:38 -0000 1.1 --- TRIMAction.java 12 Mar 2007 08:46:38 -0000 1.2 *************** *** 1,5 **** --- 1,8 ---- package org.tolven.web; + import java.io.ByteArrayOutputStream; + import javax.naming.NamingException; + import javax.xml.bind.JAXBException; import org.tolven.app.entity.MenuData; *************** *** 7,10 **** --- 10,14 ---- import org.tolven.doc.entity.DocXML; import org.tolven.trim.Trim; + import org.tolven.trim.util.TRIMException; public class TRIMAction extends MenuAction { *************** *** 14,17 **** --- 18,22 ---- super(); } + /** * Get the root act of the trim object *************** *** 22,27 **** if (trim==null) { MenuData md = getDrilldownItem(); ! System.out.println( "[getAct] MD.id=" + md.getId()); if (md.getDocumentId()==0) return null; DocBase doc = documentLocal.findDocument(md.getDocumentId()); if (doc==null) { --- 27,33 ---- if (trim==null) { MenuData md = getDrilldownItem(); ! if (md==null) return null; if (md.getDocumentId()==0) return null; + System.out.println( "[getAct] MD.id=" + md.getId()); DocBase doc = documentLocal.findDocument(md.getDocumentId()); if (doc==null) { *************** *** 41,44 **** --- 47,71 ---- this.trim = trim; } + + /** + * Marshal updated trim back into the document. + * Like submit but just store in TRIM and return + * @throws Exception + */ + public String upload( ) throws Exception { + MenuData md = getMenuDataItem(); + DocBase doc = documentLocal.findDocument(md.getDocumentId()); + if (doc==null) { + throw new RuntimeException( "Document id invalid in MD " + md.getId()); + } + if (!(doc instanceof DocXML)) { + System.out.println( ); + throw new RuntimeException( "Document is not XML " + doc.getId() + " Class: " + doc.getClass().getName()); + } + ByteArrayOutputStream trimXML = new ByteArrayOutputStream() ; + xmlLocal.marshalTRIM(trim, trimXML); + doc.setContent(trimXML.toByteArray()); + return "success"; + } } |
|
From: John C. <jc...@us...> - 2007-03-12 08:46:39
|
Update of /cvsroot/tolven/tolvenWEB/web/WEB-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29442/web/WEB-INF Modified Files: web.xml faces-config.xml Log Message: Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary. Index: faces-config.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/faces-config.xml,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** faces-config.xml 5 Mar 2007 06:07:15 -0000 1.40 --- faces-config.xml 12 Mar 2007 08:46:38 -0000 1.41 *************** *** 430,433 **** --- 430,438 ---- <from-view-id>/ajax/paneDispatch.xhtml</from-view-id> <navigation-case> + <from-action>#{trim.upload}</from-action> + <from-outcome>success</from-outcome> + <to-view-id>/five/drilldown/drilldown.xhtml</to-view-id> + </navigation-case> + <navigation-case> <from-action>#{menu.createPatient}</from-action> <from-outcome>success</from-outcome> Index: web.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/web.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** web.xml 10 Mar 2007 06:03:47 -0000 1.26 --- web.xml 12 Mar 2007 08:46:38 -0000 1.27 *************** *** 197,206 **** <session-config> ! <session-timeout>30</session-timeout> </session-config> <welcome-file-list> ! <welcome-file> ! index.jsp ! </welcome-file> </welcome-file-list> <security-constraint> --- 197,204 ---- <session-config> ! <session-timeout>60</session-timeout> </session-config> <welcome-file-list> ! <welcome-file>index.jsp</welcome-file> </welcome-file-list> <security-constraint> |
|
From: John C. <jc...@us...> - 2007-03-12 08:46:39
|
Update of /cvsroot/tolven/tolvenWEB/web/five In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29442/web/five Modified Files: obsLink.xhtml resultSummary.xhtml labSummary.xhtml Log Message: Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary. Index: labSummary.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/labSummary.xhtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** labSummary.xhtml 2 Oct 2006 05:29:59 -0000 1.6 --- labSummary.xhtml 12 Mar 2007 08:46:38 -0000 1.7 *************** *** 31,35 **** <h:outputText value="More..." style="COLOR: #333333; TEXT-DECORATION: none; FONT-SIZE: 75%;TEXT-ALIGN: right;"/> </h:outputLink> ! <h:outputText rendered="#{menu.menuDataCount==0}" value="No Lab Results" style="COLOR: #333333; FONT-SIZE: 75%;TEXT-ALIGN: center;"/> </ui:composition> </body> --- 31,35 ---- <h:outputText value="More..." style="COLOR: #333333; TEXT-DECORATION: none; FONT-SIZE: 75%;TEXT-ALIGN: right;"/> </h:outputLink> ! <h:outputText rendered="#{menu.menuDataCount==0}" value="No New Lab Results" style="COLOR: #333333; FONT-SIZE: 75%;TEXT-ALIGN: center;"/> </ui:composition> </body> Index: obsLink.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/obsLink.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** obsLink.xhtml 16 Feb 2007 04:18:30 -0000 1.1 --- obsLink.xhtml 12 Mar 2007 08:46:38 -0000 1.2 *************** *** 11,15 **** <ui:composition> <h:outputText value="#{menu.menuDataItem.string01}"/> ! <h:outputText value=" (#{menu.menuDataItem.string02})"/> </ui:composition> </body> --- 11,15 ---- <ui:composition> <h:outputText value="#{menu.menuDataItem.string01}"/> ! <h:outputText value=" (#{menu.menuDataItem.status})"/> </ui:composition> </body> Index: resultSummary.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/resultSummary.xhtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** resultSummary.xhtml 4 Dec 2006 08:59:00 -0000 1.2 --- resultSummary.xhtml 12 Mar 2007 08:46:38 -0000 1.3 *************** *** 31,35 **** <h:outputText value="More..." style="COLOR: #333333; TEXT-DECORATION: none; FONT-SIZE: 75%;TEXT-ALIGN: right;"/> </h:outputLink> ! <h:outputText rendered="#{menu.menuDataCount==0}" value="No Lab Results" style="COLOR: #333333; FONT-SIZE: 75%;TEXT-ALIGN: center;"/> </ui:composition> </body> --- 31,35 ---- <h:outputText value="More..." style="COLOR: #333333; TEXT-DECORATION: none; FONT-SIZE: 75%;TEXT-ALIGN: right;"/> </h:outputLink> ! <h:outputText rendered="#{menu.menuDataCount==0}" value="No New Lab Results" style="COLOR: #333333; FONT-SIZE: 75%;TEXT-ALIGN: center;"/> </ui:composition> </body> |
|
From: John C. <jc...@us...> - 2007-03-12 08:46:39
|
Update of /cvsroot/tolven/tolvenWEB/web/five/drilldown In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29442/web/five/drilldown Added Files: weightDD.xhtml drilldown.xhtml Log Message: Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary. --- NEW FILE: drilldown.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Drilldown/finalization page</title> </head> <body> <ui:composition> <p>NOTE: This summary step is always a reflection of what's on the server - in other words, submitting is always a matter of submitting what is already safely committed to the database. As such, this is the only sensible step to display on a post-submission drilldown. </p> <ui:include src="/five/drilldown/weightDD.xhtml"> <ui:param name="act" value="#{trim.trim.act}"/> </ui:include> <div class="help" id="#{menu.elementLabel}help3" style="display:none"> <h1>Finalize</h1> <p>The Submit button remains disabled until all entered data is validated and has been stored on the server in your private holding area. The time field represents the time when the data was most recently captured on the server (not the time of the observation). Clicking the submit button will mark this document as complete, actionable, and immutable.</p> <p>You may be asked to enter your password. This is necessary to digitally sign this document attesting the fact that only you could have submitted the form.</p> </div> </ui:composition> </body> </html> --- NEW FILE: weightDD.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Patient Weight - Drilldown</title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> <body> <ui:composition> <div class="pagesm"> #{act.title.ST.value}<br/> Date of Observation: #{act.effectiveTime.TS[0]} <br/> Value: #{act.observation.value.PQS[0].value} #{act.observation.value.PQS[0].unit} <br/> Device: <br/> Clothing: <br/> </div> </ui:composition> </body> </html> |
|
From: John C. <jc...@us...> - 2007-03-12 08:46:39
|
Update of /cvsroot/tolven/tolvenWEB/web/scripts In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29442/web/scripts Modified Files: tolvenwiz.js tolven6.js Log Message: Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary. Index: tolvenwiz.js =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/scripts/tolvenwiz.js,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tolvenwiz.js 17 Feb 2007 01:04:59 -0000 1.6 --- tolvenwiz.js 12 Mar 2007 08:46:39 -0000 1.7 *************** *** 10,13 **** --- 10,47 ---- } + // Cancel and destroy the current wizard, first on the server, then on the browser. + function wizCancel( element ) { + // alert( "Cancel: " + element ); + var myAjax = new Ajax.Request( + 'wizCancel.ajaxi', + { + method: 'get', + parameters: 'element='+element, + onComplete: wizCancelDone + }); + } + + function wizCancelDone( request ) { + // alert( "response: " + request.responseText ); + closeTab(request.responseText); + } + + // Submit specified element (nothing is uploaded, which will already be done + function wizSubmit( element ) { + // alert( "Submit: " + element ); + var myAjax = new Ajax.Request( + 'wizSubmit.ajaxi', + { + method: 'get', + parameters: 'element='+element, + onComplete: wizSubmitDone + }); + } + + function wizSubmitDone( request ) { + // alert( "response: " + request.responseText ); + closeTab(request.responseText); + } + // Setup steps function setupWizSteps(prefix, firstStep) { *************** *** 18,26 **** var stepHeadings = ""; var stepIcons = ""; ! for ( var s=0; s < steps.length; s++) { ! steps[s].id = prefix+ 'step' + (s+1); ! Element.hide(steps[s]); ! stepHeadings = stepHeadings + makeHeading( prefix, s+1, steps[s].title ); ! stepIcons = stepIcons + makeIcon( prefix, s+1, steps[s].title ); } $(prefix+'stepHeadings').innerHTML = stepHeadings; --- 52,62 ---- var stepHeadings = ""; var stepIcons = ""; ! if (steps.length > 1) { ! for ( var s=0; s < steps.length; s++) { ! steps[s].id = prefix+ 'step' + (s+1); ! Element.hide(steps[s]); ! stepHeadings = stepHeadings + makeHeading( prefix, s+1, steps[s].title ); ! stepIcons = stepIcons + makeIcon( prefix, s+1, steps[s].title ); ! } } $(prefix+'stepHeadings').innerHTML = stepHeadings; *************** *** 35,40 **** var lastStep = 1*root.getAttribute('lastStep'); if (stepNumber==currentStep) return; ! if (stepNumber==lastStep) $(prefix+'nextButton').disabled=true; ! else $(prefix+'nextButton').disabled=false; if (stepNumber==1) $(prefix+'prevButton').disabled=true; else $(prefix+'prevButton').disabled=false; --- 71,81 ---- var lastStep = 1*root.getAttribute('lastStep'); if (stepNumber==currentStep) return; ! if (stepNumber==lastStep) { ! $(prefix+'nextButton').disabled=true; ! $(prefix+'submitButton').disabled=false; ! } else { ! $(prefix+'nextButton').disabled=false; ! $(prefix+'submitButton').disabled=true; ! } if (stepNumber==1) $(prefix+'prevButton').disabled=true; else $(prefix+'prevButton').disabled=false; *************** *** 146,150 **** // Validate a text field function validate( field, value ) { - // Element.hide( "occList" ); var choices = choiceList[field.getAttribute("choices")]; if (choices==null) return; --- 187,190 ---- Index: tolven6.js =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/scripts/tolven6.js,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** tolven6.js 16 Feb 2007 04:17:41 -0000 1.13 --- tolven6.js 12 Mar 2007 08:46:39 -0000 1.14 *************** *** 32,35 **** --- 32,73 ---- } + // Upload changes based on changes to the form + function wizUpload( obj, value ) { + var elementId = $(obj).getAttribute( "tolvenid" ); + // $($(obj).getAttribute( "submitButton" )).disabled = true; + // alert( "Upload id: " + $(obj).id + " element=" + elementId + " to: " + $(obj).action ); + // $(elementId+ ":drilldown").innerHTML = "Waiting for server..." ; + ajaxSubmit3( $(obj), elementId ); + } + + // Intercept a normal Submit and do it Ajax-style instead. + // In this case, we don't overlay the pane, but rather load to the + // drilldown pane + function ajaxSubmit3(form, element ) { + var elements = Form.getElements(form); + var queryComponents = new Array(); + for (var i = 0; i < elements.length; i++) { + var queryComponent = Form.Element.serialize(elements[i]); + if (queryComponent) queryComponents.push(queryComponent); + } + queryComponents.push( 'element='+element ); + // alert( "submit element=" + element + " to: " + form.action ); + // Form.disable( form ); // Don't allow edits or button pushes + var ajax = new Ajax.Updater( + element+ ":drilldown", // Put results here + form.action, // URL + { // options + method:'post', + evalScripts: true, + postBody: queryComponents.join('&') + }); + return false; + } + + // OK to allow Submit button now. + function ajaxSubmit3Done( req ) { + alert( req.getAttribute( "element") ); + } + // Intercept a normal Submit and do it Ajax-style instead function ajaxSubmit(b) { *************** *** 226,229 **** --- 264,285 ---- showPane(req.responseText); } + + // Fetch TRIM content of a document from server + function trimGet( element ) { + var instAjax = new Ajax.Request( + 'trimGet.ajaxi', + { + method: 'get', + parameters: 'element='+element, + onComplete: buildForm + }); + // instAjax.setAttribute( "elementId", element ); + } + + + // Once instantiated, we can build the form + function buildForm(req) { + alert( req.responseText ); + } function showPane( paneId ) { |
Update of /cvsroot/tolven/tolvenWEB/web/tab In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29442/web/tab Removed Files: voc.xhtml testFamily.xhtml phrInbox.xhtml phrRecList.xhtml prefDemog.xhtml prefPhotos.xhtml news.xhtml genNewUser.xhtml opensrc.xhtml platform.xhtml mission.xhtml testLDAP.xhtml patOver.xhtml familyDetail.xhtml echr.xhtml testUMLS.xhtml userDemog.xhtml genPerson.xhtml photoDetail.xhtml dummyDetail.xhtml ephr.xhtml sw.xhtml dummy.xhtml Log Message: Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary. --- prefPhotos.xhtml DELETED --- --- mission.xhtml DELETED --- --- testUMLS.xhtml DELETED --- --- news.xhtml DELETED --- --- userDemog.xhtml DELETED --- --- familyDetail.xhtml DELETED --- --- testFamily.xhtml DELETED --- --- platform.xhtml DELETED --- --- opensrc.xhtml DELETED --- --- photoDetail.xhtml DELETED --- --- dummy.xhtml DELETED --- --- dummyDetail.xhtml DELETED --- --- sw.xhtml DELETED --- --- echr.xhtml DELETED --- --- voc.xhtml DELETED --- --- phrRecList.xhtml DELETED --- --- testLDAP.xhtml DELETED --- --- genPerson.xhtml DELETED --- --- ephr.xhtml DELETED --- --- patOver.xhtml DELETED --- --- genNewUser.xhtml DELETED --- --- phrInbox.xhtml DELETED --- --- prefDemog.xhtml DELETED --- |
|
From: John C. <jc...@us...> - 2007-03-12 08:17:23
|
Update of /cvsroot/tolven/tolvenWEB/web/scripts In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17288/web/scripts Modified Files: Tag: P_JC_DataEntry3 tolven6.js Log Message: Data entry Index: tolven6.js =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/scripts/tolven6.js,v retrieving revision 1.13.4.3 retrieving revision 1.13.4.4 diff -C2 -d -r1.13.4.3 -r1.13.4.4 *** tolven6.js 12 Mar 2007 05:22:58 -0000 1.13.4.3 --- tolven6.js 12 Mar 2007 08:17:22 -0000 1.13.4.4 *************** *** 35,42 **** function wizUpload( obj, value ) { var elementId = $(obj).getAttribute( "tolvenid" ); ! $($(obj).getAttribute( "submitButton" )).disabled = true; // alert( "Upload id: " + $(obj).id + " element=" + elementId + " to: " + $(obj).action ); ! $(elementId+ ":drilldown").innerHTML( "Waiting for server..." ); ! ajaxSubmit3( $(obj), elementId ); } --- 35,41 ---- function wizUpload( obj, value ) { var elementId = $(obj).getAttribute( "tolvenid" ); ! // $($(obj).getAttribute( "submitButton" )).disabled = true; // alert( "Upload id: " + $(obj).id + " element=" + elementId + " to: " + $(obj).action ); ! // $(elementId+ ":drilldown").innerHTML = "Waiting for server..." ; ajaxSubmit3( $(obj), elementId ); } *************** *** 46,50 **** // drilldown pane function ajaxSubmit3(form, element ) { ! var elements = Form.getElements(form); var queryComponents = new Array(); for (var i = 0; i < elements.length; i++) { --- 45,49 ---- // drilldown pane function ajaxSubmit3(form, element ) { ! var elements = Form.getElements(form); var queryComponents = new Array(); for (var i = 0; i < elements.length; i++) { *************** *** 60,64 **** { // options method:'post', - onComplete: ajaxSubmit3Done, evalScripts: true, postBody: queryComponents.join('&') --- 59,62 ---- *************** *** 66,72 **** return false; } // OK to allow Submit button now. function ajaxSubmit3Done( req ) { ! } --- 64,71 ---- return false; } + // OK to allow Submit button now. function ajaxSubmit3Done( req ) { ! alert( req.getAttribute( "element") ); } |
|
From: John C. <jc...@us...> - 2007-03-12 08:17:23
|
Update of /cvsroot/tolven/tolvenWEB/web/wizard In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17288/web/wizard Modified Files: Tag: P_JC_DataEntry3 wizTemplate.xhtml weight.xhtml Log Message: Data entry Index: wizTemplate.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/wizTemplate.xhtml,v retrieving revision 1.6.4.4 retrieving revision 1.6.4.5 diff -C2 -d -r1.6.4.4 -r1.6.4.5 *** wizTemplate.xhtml 12 Mar 2007 05:22:58 -0000 1.6.4.4 --- wizTemplate.xhtml 12 Mar 2007 08:17:21 -0000 1.6.4.5 *************** *** 33,37 **** setupWizSteps('#{menu.elementLabel}', 1); $('#{menu.elementLabel}form').setAttribute( 'tolvenid', '#{menu.element}' ); ! $('#{menu.elementLabel}form').setAttribute( 'submitButton', '#{menu.elementLabel}submitButton' ); new Form.Observer( '#{menu.elementLabel}form', 1, wizUpload ); // alert( "Observer setup for: " + $('#{menu.elementLabel}form').getAttribute( 'tolvenid' ) ); --- 33,37 ---- setupWizSteps('#{menu.elementLabel}', 1); $('#{menu.elementLabel}form').setAttribute( 'tolvenid', '#{menu.element}' ); ! // $('#{menu.elementLabel}form').setAttribute( 'submitButton', '#{menu.elementLabel}submitButton' ); new Form.Observer( '#{menu.elementLabel}form', 1, wizUpload ); // alert( "Observer setup for: " + $('#{menu.elementLabel}form').getAttribute( 'tolvenid' ) ); *************** *** 84,88 **** <tr> <td align="center"> ! <h:commandButton action="#{trim.upload}" value="Upload"/> <input id="#{menu.elementLabel}cancelButton" type="submit" value="Cancel" onclick="wizCancel('#{menu.element}');"/> <input id="#{menu.elementLabel}prevButton" type="submit" value="Previous" onclick="prevStep('#{menu.elementLabel}' );self.scrollTo(0, 0);return false;"/> --- 84,88 ---- <tr> <td align="center"> ! <h:commandButton action="#{trim.upload}" value="Upload" style="display:none"/> <input id="#{menu.elementLabel}cancelButton" type="submit" value="Cancel" onclick="wizCancel('#{menu.element}');"/> <input id="#{menu.elementLabel}prevButton" type="submit" value="Previous" onclick="prevStep('#{menu.elementLabel}' );self.scrollTo(0, 0);return false;"/> Index: weight.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/Attic/weight.xhtml,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** weight.xhtml 12 Mar 2007 05:22:58 -0000 1.1.2.5 --- weight.xhtml 12 Mar 2007 08:17:21 -0000 1.1.2.6 *************** *** 34,38 **** <ui:include src="/wizard/datetime.xhtml"> <ui:param name="ts" value="#{trim.trim.act.effectiveTime.TS[0]}"/> ! </ui:include> #{menu.menuDataItem.string01} <h:inputText id="val" value="#{trim.trim.act.observation.value.PQS[0].value}"/> #{trim.trim.act.observation.value.PQS[0].unit}<br/> </div> --- 34,38 ---- <ui:include src="/wizard/datetime.xhtml"> <ui:param name="ts" value="#{trim.trim.act.effectiveTime.TS[0]}"/> ! </ui:include><br/> #{menu.menuDataItem.string01} <h:inputText id="val" value="#{trim.trim.act.observation.value.PQS[0].value}"/> #{trim.trim.act.observation.value.PQS[0].unit}<br/> </div> |
|
From: John C. <jc...@us...> - 2007-03-12 05:23:33
|
Update of /cvsroot/tolven/tolvenEJB/resources/rules In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8351/resources/rules Modified Files: Tag: P_JC_DataEntry3 ephr.drl Log Message: update Index: ephr.drl =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/rules/ephr.drl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -d -r1.2.2.3 -r1.2.2.4 *** ephr.drl 11 Mar 2007 20:36:48 -0000 1.2.2.3 --- ephr.drl 12 Mar 2007 05:23:33 -0000 1.2.2.4 *************** *** 72,76 **** System.out.println( "Create observation placeholder for " + $patName); MenuData mdObs = app.createPlaceholder($act, "ephr:patient:observation", $mdPat); ! mdObs.setPqStringVal01($act.getObservation().getValue().getPQS().get(0).getValue()); mdObs.setPqUnits01($act.getObservation().getValue().getPQS().get(0).getUnit()); assert( mdObs ); --- 72,77 ---- System.out.println( "Create observation placeholder for " + $patName); MenuData mdObs = app.createPlaceholder($act, "ephr:patient:observation", $mdPat); ! mdObs.setPqValue01($act.getObservation().getValue().getPQS().get(0).getValue()); ! mdObs.setPqStringVal01( Double.toString( mdObs.getPqValue01()) ); mdObs.setPqUnits01($act.getObservation().getValue().getPQS().get(0).getUnit()); assert( mdObs ); *************** *** 80,84 **** * If we find a (new) observation placeholder, we'll want to add it to the observation list. */ ! rule "Place observation placeholder on observation list" when $msObservation: MenuStructure( role == "placeholder", path == "ephr:patient:observation" ) --- 81,85 ---- * If we find a (new) observation placeholder, we'll want to add it to the observation list. */ ! rule "Place observation on observation list" when $msObservation: MenuStructure( role == "placeholder", path == "ephr:patient:observation" ) *************** *** 88,94 **** // Add act to patient's observation list MenuData mdObsList = app.createReferenceMD( $mdObservation, "ephr:patient:doc:obs:values", $mdPat ); - // mdObsList.setPqStringVal01( ); end /** --- 89,106 ---- // Add act to patient's observation list MenuData mdObsList = app.createReferenceMD( $mdObservation, "ephr:patient:doc:obs:values", $mdPat ); end + /** + * If we find a (new) observation placeholder, we'll want to add it to the observation summary. + */ + rule "Place observation on observation summary list" + when + $msObservation: MenuStructure( role == "placeholder", path == "ephr:patient:observation" ) + $mdObservation: MenuData( menuStructure == $msObservation, $mdPat: parent01 ) + then + System.out.println( "Place observation on obs summary"); + // Add act to patient's observation list + MenuData mdObsList = app.createReferenceMD( $mdObservation, "ephr:patient:summary:obssum", $mdPat ); + end /** |
|
From: John C. <jc...@us...> - 2007-03-12 05:23:33
|
Update of /cvsroot/tolven/tolvenEJB/resources/xsd In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8351/resources/xsd Modified Files: Tag: P_JC_DataEntry3 trim4.xsd Log Message: update Index: trim4.xsd =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/xsd/trim4.xsd,v retrieving revision 1.2.6.1 retrieving revision 1.2.6.2 diff -C2 -d -r1.2.6.1 -r1.2.6.2 *** trim4.xsd 10 Mar 2007 04:13:27 -0000 1.2.6.1 --- trim4.xsd 12 Mar 2007 05:23:33 -0000 1.2.6.2 *************** *** 13,16 **** --- 13,19 ---- <xs:element name="page" type="xs:string"/> <xs:element name="instance" type="xs:string"/> + <xs:element name="documentId" type="xs:string"/> + <xs:element name="element" type="xs:string"/> + <xs:element name="instance" type="xs:string"/> <xs:element name="menu" type="xs:string" maxOccurs="unbounded"/> <xs:element name="act" type="ActSlot"/> |
|
From: John C. <jc...@us...> - 2007-03-12 05:23:33
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8351/src/org/tolven/app/bean Modified Files: Tag: P_JC_DataEntry3 AppEvalAdaptor.java Log Message: update Index: AppEvalAdaptor.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/AppEvalAdaptor.java,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** AppEvalAdaptor.java 10 Mar 2007 04:13:26 -0000 1.5.2.1 --- AppEvalAdaptor.java 12 Mar 2007 05:23:32 -0000 1.5.2.2 *************** *** 208,211 **** --- 208,234 ---- md.setString01(mdReferenced.getString01() ); md.setDocumentId(mdReferenced.getDocumentId()); + md.setString02( mdReferenced.getString02()); + md.setString03( mdReferenced.getString03()); + md.setString04( mdReferenced.getString04()); + md.setDate01( mdReferenced.getDate01()); + md.setDate02( mdReferenced.getDate02()); + md.setDate03( mdReferenced.getDate03()); + md.setDate04( mdReferenced.getDate04()); + md.setPqStringVal01( mdReferenced.getPqStringVal01()); + md.setPqStringVal02( mdReferenced.getPqStringVal02()); + md.setPqStringVal03( mdReferenced.getPqStringVal03()); + md.setPqStringVal04( mdReferenced.getPqStringVal04()); + md.setPqValue01( mdReferenced.getPqValue01()); + md.setPqValue02( mdReferenced.getPqValue02()); + md.setPqValue03( mdReferenced.getPqValue03()); + md.setPqValue04( mdReferenced.getPqValue04()); + md.setPqUnits01( mdReferenced.getPqUnits01()); + md.setPqUnits02( mdReferenced.getPqUnits02()); + md.setPqUnits03( mdReferenced.getPqUnits03()); + md.setPqUnits04( mdReferenced.getPqUnits04()); + md.setLong01( mdReferenced.getLong01()); + md.setLong02( mdReferenced.getLong02()); + md.setLong03( mdReferenced.getLong03()); + md.setLong04( mdReferenced.getLong04()); menuBean.persistMenuData(md); System.out.println( "Created reference: " + md.getPath() + " to " + md.getReference().getPath()); |
|
From: John C. <jc...@us...> - 2007-03-12 05:23:33
|
Update of /cvsroot/tolven/tolvenEJB/resources/trim In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8351/resources/trim Modified Files: Tag: P_JC_DataEntry3 glucose.trim weight.trim Log Message: update Index: glucose.trim =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/trim/glucose.trim,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** glucose.trim 10 Mar 2007 04:13:26 -0000 1.1.2.1 --- glucose.trim 12 Mar 2007 05:23:32 -0000 1.1.2.2 *************** *** 28,32 **** <value> <PQ> ! <value>0.0</value> <unit>mg/dL</unit> </PQ> --- 28,32 ---- <value> <PQ> ! <value></value> <unit>mg/dL</unit> </PQ> Index: weight.trim =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/trim/weight.trim,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** weight.trim 8 Mar 2007 17:00:14 -0000 1.1 --- weight.trim 12 Mar 2007 05:23:32 -0000 1.1.2.1 *************** *** 25,29 **** </title> <effectiveTime> ! <TS>123</TS> </effectiveTime> <activityTime> --- 25,29 ---- </title> <effectiveTime> ! <TS>20070101090000</TS> </effectiveTime> <activityTime> *************** *** 44,49 **** <value> <PQ> ! <value>23.0</value> ! <unit>mg/dL</unit> </PQ> </value> --- 44,49 ---- <value> <PQ> ! <value></value> ! <unit>lb</unit> </PQ> </value> |
|
From: John C. <jc...@us...> - 2007-03-12 05:22:59
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7933/src/org/tolven/web Modified Files: Tag: P_JC_DataEntry3 MenuAction.java Log Message: update Index: MenuAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/MenuAction.java,v retrieving revision 1.37.2.3 retrieving revision 1.37.2.4 diff -C2 -d -r1.37.2.3 -r1.37.2.4 *** MenuAction.java 11 Mar 2007 20:36:16 -0000 1.37.2.3 --- MenuAction.java 12 Mar 2007 05:22:58 -0000 1.37.2.4 *************** *** 194,198 **** element = params.get("element"); } ! System.out.println( "getElement: " + element); return element; } --- 194,198 ---- element = params.get("element"); } ! // System.out.println( "getElement: " + element); return element; } |
|
From: John C. <jc...@us...> - 2007-03-12 05:22:59
|
Update of /cvsroot/tolven/tolvenWEB/web/wizard In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7933/web/wizard Modified Files: Tag: P_JC_DataEntry3 wizTemplate.xhtml weight.xhtml Added Files: Tag: P_JC_DataEntry3 datetime.xhtml Log Message: update --- NEW FILE: datetime.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Date fields</title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> <body> <ui:composition> <h:inputText id="#{menu.elementLabel}gcsT" value="#{ts}" size="30"/><br/> <a href="javascript:addHours('#{menu.elementLabel}gcsT',-1);">-1h</a> <a href="javascript:addMinutes('#{menu.elementLabel}gcsT',-10);">-10m</a> <a href="javascript:addMinutes('#{menu.elementLabel}gcsT',-1);">-1m</a> <a href="javascript:setNow('#{menu.elementLabel}gcsT');">now</a> <a href="javascript:addMinutes('#{menu.elementLabel}gcsT', 1);">+1m</a> <a href="javascript:addMinutes('#{menu.elementLabel}gcsT', 10);">+10m</a> <a href="javascript:addHours('#{menu.elementLabel}gcsT', 1);">+1h</a> </ui:composition> </body> </html> Index: wizTemplate.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/wizTemplate.xhtml,v retrieving revision 1.6.4.3 retrieving revision 1.6.4.4 diff -C2 -d -r1.6.4.3 -r1.6.4.4 *** wizTemplate.xhtml 11 Mar 2007 20:36:15 -0000 1.6.4.3 --- wizTemplate.xhtml 12 Mar 2007 05:22:58 -0000 1.6.4.4 *************** *** 29,39 **** <script language="JavaScript" type="text/javascript"> // <![CDATA[ ! $('#{menu.elementLabel}').setAttribute( 'currentStep', 0 ); ! $('#{menu.elementLabel}').setAttribute( 'lastStep', 0 ); ! setupWizSteps('#{menu.elementLabel}', 1); // ]]> </script> ! <h:form id="#{menu.elementLabel}" onsubmit="ajaxSubmit3(this, '#{menu.element}');return false;"> <div class="infobar" > <table width="100%"> --- 29,43 ---- <script language="JavaScript" type="text/javascript"> // <![CDATA[ ! $('#{menu.elementLabel}').setAttribute( 'currentStep', 0 ); ! $('#{menu.elementLabel}').setAttribute( 'lastStep', 0 ); ! setupWizSteps('#{menu.elementLabel}', 1); ! $('#{menu.elementLabel}form').setAttribute( 'tolvenid', '#{menu.element}' ); ! $('#{menu.elementLabel}form').setAttribute( 'submitButton', '#{menu.elementLabel}submitButton' ); ! new Form.Observer( '#{menu.elementLabel}form', 1, wizUpload ); ! // alert( "Observer setup for: " + $('#{menu.elementLabel}form').getAttribute( 'tolvenid' ) ); // ]]> </script> ! <h:form id="#{menu.elementLabel}form" onsubmit="ajaxSubmit3(this, '#{menu.element}');return false;"> <div class="infobar" > <table width="100%"> *************** *** 92,96 **** </h:form> </div> ! </ui:composition> </body> </html> \ No newline at end of file --- 96,100 ---- </h:form> </div> ! </ui:composition> </body> </html> \ No newline at end of file Index: weight.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/Attic/weight.xhtml,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** weight.xhtml 11 Mar 2007 20:36:15 -0000 1.1.2.4 --- weight.xhtml 12 Mar 2007 05:22:58 -0000 1.1.2.5 *************** *** 13,22 **** <ui:composition> <c:if test="#{menu.menuDataItem.status=='NEW'}"> ! <div class="step" title="Getting Started" > <div class="pagesm"> <p>How to enter your weight</p> ! <p>In this form you will enter a value. But first, take your shoes off and have a piece of bread.</p> ! <p>Click the next button when you're ready to begin.</p> ! Page: #{trim.trim.page} </div> <div class="help" id="#{menu.elementLabel}help1" style="display:none"> --- 13,22 ---- <ui:composition> <c:if test="#{menu.menuDataItem.status=='NEW'}"> ! <div class="step" title="Getting Started - #{menu.menuDataItem.string01}" > <div class="pagesm"> <p>How to enter your weight</p> ! <p>In this form you will enter your weight. Take your shoes off. Weight yourself.</p> ! <p>Click the next button to enter your weight.</p> ! [Tolven Page: #{trim.trim.page}] </div> <div class="help" id="#{menu.elementLabel}help1" style="display:none"> *************** *** 28,37 **** </div> </div> ! <div class="step" title="Enter Weight" > <div class="pagesm"> - <p>Weight</p> Test: #{menu.menuDataItem.string01} <br/> ! Date: #{menu.menuDataItem.date01} <br/> ! Weight <h:inputText value="#{trim.trim.act.observation.value.PQS[0].value}"/> lbs<br/> </div> <div class="help" id="#{menu.elementLabel}help2" style="display:none"> --- 28,39 ---- </div> </div> ! <div class="step" title="Enter #{menu.menuDataItem.string01}" > <div class="pagesm"> Test: #{menu.menuDataItem.string01} <br/> ! Date of observation: <br/> ! <ui:include src="/wizard/datetime.xhtml"> ! <ui:param name="ts" value="#{trim.trim.act.effectiveTime.TS[0]}"/> ! </ui:include> ! #{menu.menuDataItem.string01} <h:inputText id="val" value="#{trim.trim.act.observation.value.PQS[0].value}"/> #{trim.trim.act.observation.value.PQS[0].unit}<br/> </div> <div class="help" id="#{menu.elementLabel}help2" style="display:none"> *************** *** 40,48 **** </div> </div> ! </c:if> ! <div class="step" title="Finalize" > ! <div id="#{menu.element}:drilldown"> </div> ! </div> </ui:composition> </body> --- 42,56 ---- </div> </div> ! <div class="step" title="Finalize" > ! <div id="#{menu.element}:drilldown"> ! Waiting for server... ! </div> </div> ! </c:if> ! <c:if test="#{menu.menuDataItem.status!='NEW'}"> ! <ui:include src="/five/drilldown/weightDD.xhtml"> ! <ui:param name="act" value="#{trim.trim.act}"/> ! </ui:include> ! </c:if> </ui:composition> </body> |
|
From: John C. <jc...@us...> - 2007-03-12 05:22:59
|
Update of /cvsroot/tolven/tolvenWEB/web/scripts In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7933/web/scripts Modified Files: Tag: P_JC_DataEntry3 tolvenwiz.js tolven6.js Log Message: update Index: tolvenwiz.js =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/scripts/tolvenwiz.js,v retrieving revision 1.6.4.1 retrieving revision 1.6.4.2 diff -C2 -d -r1.6.4.1 -r1.6.4.2 *** tolvenwiz.js 10 Mar 2007 04:12:07 -0000 1.6.4.1 --- tolvenwiz.js 12 Mar 2007 05:22:58 -0000 1.6.4.2 *************** *** 27,31 **** } ! // Submit specified element function wizSubmit( element ) { // alert( "Submit: " + element ); --- 27,31 ---- } ! // Submit specified element (nothing is uploaded, which will already be done function wizSubmit( element ) { // alert( "Submit: " + element ); Index: tolven6.js =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/scripts/tolven6.js,v retrieving revision 1.13.4.2 retrieving revision 1.13.4.3 diff -C2 -d -r1.13.4.2 -r1.13.4.3 *** tolven6.js 11 Mar 2007 20:36:16 -0000 1.13.4.2 --- tolven6.js 12 Mar 2007 05:22:58 -0000 1.13.4.3 *************** *** 32,35 **** --- 32,45 ---- } + // Upload changes based on changes to the form + function wizUpload( obj, value ) { + var elementId = $(obj).getAttribute( "tolvenid" ); + $($(obj).getAttribute( "submitButton" )).disabled = true; + // alert( "Upload id: " + $(obj).id + " element=" + elementId + " to: " + $(obj).action ); + $(elementId+ ":drilldown").innerHTML( "Waiting for server..." ); + + ajaxSubmit3( $(obj), elementId ); + } + // Intercept a normal Submit and do it Ajax-style instead. // In this case, we don't overlay the pane, but rather load to the *************** *** 43,47 **** } queryComponents.push( 'element='+element ); ! // alert( "submit: " + visiblePage + " element=" + element); // Form.disable( form ); // Don't allow edits or button pushes var ajax = new Ajax.Updater( --- 53,57 ---- } queryComponents.push( 'element='+element ); ! // alert( "submit element=" + element + " to: " + form.action ); // Form.disable( form ); // Don't allow edits or button pushes var ajax = new Ajax.Updater( *************** *** 50,53 **** --- 60,64 ---- { // options method:'post', + onComplete: ajaxSubmit3Done, evalScripts: true, postBody: queryComponents.join('&') *************** *** 55,59 **** --- 66,73 ---- return false; } + // OK to allow Submit button now. + function ajaxSubmit3Done( req ) { + } // Intercept a normal Submit and do it Ajax-style instead |
|
From: Joseph I. <jos...@us...> - 2007-03-11 22:06:13
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/security In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22624/src/org/tolven/security Modified Files: Tag: P_JI_RefreshAPK TolvenPrincipal.java Log Message: Added pretty print to TolvenUser to show the name Index: TolvenPrincipal.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/TolvenPrincipal.java,v retrieving revision 1.2 retrieving revision 1.2.8.1 diff -C2 -d -r1.2 -r1.2.8.1 *** TolvenPrincipal.java 19 Feb 2007 13:02:45 -0000 1.2 --- TolvenPrincipal.java 11 Mar 2007 22:06:09 -0000 1.2.8.1 *************** *** 42,45 **** --- 42,49 ---- return name.hashCode(); } + + public String toString() { + return getName(); + } } |
|
From: John C. <jc...@us...> - 2007-03-11 20:36:50
|
Update of /cvsroot/tolven/tolvenEJB/resources/rules In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18912/resources/rules Modified Files: Tag: P_JC_DataEntry3 ephr.drl Log Message: update Index: ephr.drl =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/rules/ephr.drl,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** ephr.drl 10 Mar 2007 22:31:04 -0000 1.2.2.2 --- ephr.drl 11 Mar 2007 20:36:48 -0000 1.2.2.3 *************** *** 72,75 **** --- 72,77 ---- System.out.println( "Create observation placeholder for " + $patName); MenuData mdObs = app.createPlaceholder($act, "ephr:patient:observation", $mdPat); + mdObs.setPqStringVal01($act.getObservation().getValue().getPQS().get(0).getValue()); + mdObs.setPqUnits01($act.getObservation().getValue().getPQS().get(0).getUnit()); assert( mdObs ); end |
|
From: John C. <jc...@us...> - 2007-03-11 20:36:19
|
Update of /cvsroot/tolven/tolvenWEB/web/WEB-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18809/web/WEB-INF Modified Files: Tag: P_JC_DataEntry3 faces-config.xml Log Message: update Index: faces-config.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/faces-config.xml,v retrieving revision 1.40 retrieving revision 1.40.2.1 diff -C2 -d -r1.40 -r1.40.2.1 *** faces-config.xml 5 Mar 2007 06:07:15 -0000 1.40 --- faces-config.xml 11 Mar 2007 20:36:16 -0000 1.40.2.1 *************** *** 430,433 **** --- 430,438 ---- <from-view-id>/ajax/paneDispatch.xhtml</from-view-id> <navigation-case> + <from-action>#{trim.upload}</from-action> + <from-outcome>success</from-outcome> + <to-view-id>/five/drilldown/drilldown.xhtml</to-view-id> + </navigation-case> + <navigation-case> <from-action>#{menu.createPatient}</from-action> <from-outcome>success</from-outcome> |
|
From: John C. <jc...@us...> - 2007-03-11 20:36:18
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18809/src/org/tolven/web Modified Files: Tag: P_JC_DataEntry3 MenuAction.java Log Message: update Index: MenuAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/MenuAction.java,v retrieving revision 1.37.2.2 retrieving revision 1.37.2.3 diff -C2 -d -r1.37.2.2 -r1.37.2.3 *** MenuAction.java 11 Mar 2007 08:47:02 -0000 1.37.2.2 --- MenuAction.java 11 Mar 2007 20:36:16 -0000 1.37.2.3 *************** *** 194,197 **** --- 194,198 ---- element = params.get("element"); } + System.out.println( "getElement: " + element); return element; } |
|
From: John C. <jc...@us...> - 2007-03-11 20:36:18
|
Update of /cvsroot/tolven/tolvenWEB/web/scripts In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18809/web/scripts Modified Files: Tag: P_JC_DataEntry3 tolven6.js Log Message: update Index: tolven6.js =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/scripts/tolven6.js,v retrieving revision 1.13.4.1 retrieving revision 1.13.4.2 diff -C2 -d -r1.13.4.1 -r1.13.4.2 *** tolven6.js 11 Mar 2007 08:47:02 -0000 1.13.4.1 --- tolven6.js 11 Mar 2007 20:36:16 -0000 1.13.4.2 *************** *** 32,38 **** } ! // Intercept a normal Submit and do it Ajax-style instead. We don't overlay the pane, though. ! function ajaxSubmit3(f ) { ! var elements = Form.getElements(f); var queryComponents = new Array(); for (var i = 0; i < elements.length; i++) { --- 32,40 ---- } ! // Intercept a normal Submit and do it Ajax-style instead. ! // In this case, we don't overlay the pane, but rather load to the ! // drilldown pane ! function ajaxSubmit3(form, element ) { ! var elements = Form.getElements(form); var queryComponents = new Array(); for (var i = 0; i < elements.length; i++) { *************** *** 40,51 **** if (queryComponent) queryComponents.push(queryComponent); } ! queryComponents.push( 'element='+visiblePage ); ! // alert( "submit: " + visiblePage ); ! // Form.disable( f ); // Don't allow edits or button pushes ! var ajax = new Ajax.Request( ! f.action, // URL { // options method:'post', ! evalScripts: false, postBody: queryComponents.join('&') }); --- 42,54 ---- if (queryComponent) queryComponents.push(queryComponent); } ! queryComponents.push( 'element='+element ); ! // alert( "submit: " + visiblePage + " element=" + element); ! // Form.disable( form ); // Don't allow edits or button pushes ! var ajax = new Ajax.Updater( ! element+ ":drilldown", // Put results here ! form.action, // URL { // options method:'post', ! evalScripts: true, postBody: queryComponents.join('&') }); |
|
From: John C. <jc...@us...> - 2007-03-11 20:36:17
|
Update of /cvsroot/tolven/tolvenWEB/web/five/drilldown In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18809/web/five/drilldown Added Files: Tag: P_JC_DataEntry3 drilldown.xhtml Log Message: update --- NEW FILE: drilldown.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Drilldown/finalization page</title> </head> <body> <ui:composition> <p>NOTE: This summary step is always a reflection of what's on the server - in other words, submitting is always a matter of submitting what is already safely committed to the database. As such, this is the only sensible step to display on a post-submission drilldown. </p> <ui:include src="/five/drilldown/weightDD.xhtml"> <ui:param name="act" value="#{trim.trim.act}"/> </ui:include> <div class="help" id="#{menu.elementLabel}help3" style="display:none"> <h1>Finalize</h1> <p>The Submit button remains disabled until all entered data is validated and has been stored on the server in your private holding area. The time field represents the time when the data was most recently captured on the server (not the time of the observation). Clicking the submit button will mark this document as complete, actionable, and immutable.</p> <p>You may be asked to enter your password. This is necessary to digitally sign this document attesting the fact that only you could have submitted the form.</p> </div> </ui:composition> </body> </html> |
|
From: John C. <jc...@us...> - 2007-03-11 20:36:17
|
Update of /cvsroot/tolven/tolvenWEB/web/wizard In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18809/web/wizard Modified Files: Tag: P_JC_DataEntry3 wizTemplate.xhtml weight.xhtml Log Message: update Index: wizTemplate.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/wizTemplate.xhtml,v retrieving revision 1.6.4.2 retrieving revision 1.6.4.3 diff -C2 -d -r1.6.4.2 -r1.6.4.3 *** wizTemplate.xhtml 11 Mar 2007 08:47:02 -0000 1.6.4.2 --- wizTemplate.xhtml 11 Mar 2007 20:36:15 -0000 1.6.4.3 *************** *** 35,44 **** </script> ! <h:form id="#{menu.elementLabel}" onsubmit="ajaxSubmit3(this);return false;"> <div class="infobar" > <table width="100%"> <tbody> <tr> ! <td width="30%" class="name">#{subject}</td> <td width="34%" class="infotitle">#{title}</td> <td width="30%" class="author">Template provided by #{author}</td> --- 35,44 ---- </script> ! <h:form id="#{menu.elementLabel}" onsubmit="ajaxSubmit3(this, '#{menu.element}');return false;"> <div class="infobar" > <table width="100%"> <tbody> <tr> ! <td width="30%" class="name">#{subject} </td> <td width="34%" class="infotitle">#{title}</td> <td width="30%" class="author">Template provided by #{author}</td> Index: weight.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/Attic/weight.xhtml,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** weight.xhtml 11 Mar 2007 08:47:02 -0000 1.1.2.3 --- weight.xhtml 11 Mar 2007 20:36:15 -0000 1.1.2.4 *************** *** 42,58 **** </c:if> <div class="step" title="Finalize" > ! <p>NOTE: This summary step is always a reflection of what's on the server - in other words, submitting ! is always a matter of submitting what is already safely committed to the database. As such, this is the only sensible step ! to display on a post-submission drilldown.</p> ! <ui:include src="/five/drilldown/weightDD.xhtml"> ! <ui:param name="act" value="#{trim.trim.act}"/> ! </ui:include> ! <div class="help" id="#{menu.elementLabel}help3" style="display:none"> ! <h1>Finalize</h1> ! <p>The Submit button remains disabled until all entered data is validated and has been stored on the server in your private holding area. ! The time field represents the time when the data was most recently captured on the server (not the time of the observation). Clicking the submit button will ! mark this document as complete, actionable, and immutable.</p> ! <p>You may be asked to enter your password. This is necessary to digitally sign this document attesting the fact ! that only you could have submitted the form.</p> </div> </div> --- 42,46 ---- </c:if> <div class="step" title="Finalize" > ! <div id="#{menu.element}:drilldown"> </div> </div> |
|
From: John C. <jc...@us...> - 2007-03-11 08:47:26
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13710/src/org/tolven/app/bean Modified Files: Tag: P_JC_DataEntry3 CreatorBean.java Log Message: update Index: CreatorBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/CreatorBean.java,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -C2 -d -r1.5.2.2 -r1.5.2.3 *** CreatorBean.java 10 Mar 2007 22:31:05 -0000 1.5.2.2 --- CreatorBean.java 11 Mar 2007 08:47:22 -0000 1.5.2.3 *************** *** 234,238 **** contextList.add(new MenuPath(context)); scanTrim( trim, contextList); ! trim.setDocumentId( docXML.getId()); // OK, now put the finished TRIM back into XML and store in the document. ByteArrayOutputStream trimXML = new ByteArrayOutputStream() ; --- 234,238 ---- contextList.add(new MenuPath(context)); scanTrim( trim, contextList); ! // trim.setDocumentId( docXML.getId()); // OK, now put the finished TRIM back into XML and store in the document. ByteArrayOutputStream trimXML = new ByteArrayOutputStream() ; |
|
From: John C. <jc...@us...> - 2007-03-11 08:47:04
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13297/src/org/tolven/web Modified Files: Tag: P_JC_DataEntry3 MenuAction.java TRIMAction.java Log Message: Update Index: MenuAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/MenuAction.java,v retrieving revision 1.37.2.1 retrieving revision 1.37.2.2 diff -C2 -d -r1.37.2.1 -r1.37.2.2 *** MenuAction.java 10 Mar 2007 04:12:08 -0000 1.37.2.1 --- MenuAction.java 11 Mar 2007 08:47:02 -0000 1.37.2.2 *************** *** 88,91 **** --- 88,92 ---- protected DocumentLocal documentLocal; protected XMLProtectedLocal xmlProtectedLocal; + protected XMLLocal xmlLocal; protected CreatorLocal creatorBean; private String givenName; *************** *** 104,107 **** --- 105,109 ---- documentLocal = (DocumentLocal) ctx.lookup("tolven/DocumentBean/local"); xmlProtectedLocal = (XMLProtectedLocal) ctx.lookup("tolven/XMLProtectedBean/local"); + xmlLocal = (XMLLocal) ctx.lookup("tolven/XMLBean/local"); } Index: TRIMAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TRIMAction.java,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** TRIMAction.java 10 Mar 2007 04:12:08 -0000 1.1.4.1 --- TRIMAction.java 11 Mar 2007 08:47:02 -0000 1.1.4.2 *************** *** 1,5 **** --- 1,8 ---- package org.tolven.web; + import java.io.ByteArrayOutputStream; + import javax.naming.NamingException; + import javax.xml.bind.JAXBException; import org.tolven.app.entity.MenuData; *************** *** 7,10 **** --- 10,14 ---- import org.tolven.doc.entity.DocXML; import org.tolven.trim.Trim; + import org.tolven.trim.util.TRIMException; public class TRIMAction extends MenuAction { *************** *** 14,17 **** --- 18,22 ---- super(); } + /** * Get the root act of the trim object *************** *** 42,45 **** --- 47,71 ---- this.trim = trim; } + + /** + * Marshal updated trim back into the document. + * Like submit but just store in TRIM and return + * @throws Exception + */ + public String upload( ) throws Exception { + MenuData md = getMenuDataItem(); + DocBase doc = documentLocal.findDocument(md.getDocumentId()); + if (doc==null) { + throw new RuntimeException( "Document id invalid in MD " + md.getId()); + } + if (!(doc instanceof DocXML)) { + System.out.println( ); + throw new RuntimeException( "Document is not XML " + doc.getId() + " Class: " + doc.getClass().getName()); + } + ByteArrayOutputStream trimXML = new ByteArrayOutputStream() ; + xmlLocal.marshalTRIM(trim, trimXML); + doc.setContent(trimXML.toByteArray()); + return "success"; + } } |
|
From: John C. <jc...@us...> - 2007-03-11 08:47:04
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13297/src/org/tolven/ajax Modified Files: Tag: P_JC_DataEntry3 InstantiateServlet.java Log Message: Update Index: InstantiateServlet.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax/InstantiateServlet.java,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -d -r1.3.2.2 -r1.3.2.3 *** InstantiateServlet.java 10 Mar 2007 22:24:01 -0000 1.3.2.2 --- InstantiateServlet.java 11 Mar 2007 08:47:02 -0000 1.3.2.3 *************** *** 2,39 **** import java.io.IOException; - import java.io.InputStream; import java.io.Writer; import java.util.Date; - import java.util.HashMap; - import java.util.List; - import java.util.Map; import javax.naming.InitialContext; import javax.naming.NamingException; - import javax.servlet.Servlet; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; - import javax.servlet.ServletRequest; - import javax.servlet.ServletResponse; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import javax.transaction.HeuristicMixedException; - import javax.transaction.HeuristicRollbackException; - import javax.transaction.NotSupportedException; - import javax.transaction.RollbackException; - import javax.transaction.SystemException; - import javax.transaction.UserTransaction; import javax.xml.bind.JAXBException; - import org.apache.commons.fileupload.FileItem; - import org.apache.commons.fileupload.FileUploadException; - import org.apache.commons.fileupload.disk.DiskFileItemFactory; - import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.jboss.logging.Logger; import org.tolven.app.CreatorLocal; import org.tolven.app.MenuLocal; - import org.tolven.app.bean.MenuPath; import org.tolven.app.entity.MenuData; import org.tolven.core.entity.AccountUser; --- 2,21 ---- *************** *** 42,51 **** import org.tolven.doc.XMLLocal; import org.tolven.doc.entity.DocBase; - import org.tolven.doc.entity.DocImage; - import org.tolven.gen.PersonGenerator; import org.tolven.trim.util.TRIMException; - import org.tolven.voc.umls.ConceptDAO; - import org.tolven.web.TopAction; - import org.tolven.web.security.VestibuleSecurityFilter; public class InstantiateServlet extends HttpServlet { --- 24,28 ---- |
3 messages has been excluded from this view by a project administrator.
