You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(95) |
Dec
(207) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(106) |
Feb
(69) |
Mar
(78) |
Apr
(65) |
May
(118) |
Jun
(121) |
Jul
(190) |
Aug
(95) |
Sep
(160) |
Oct
(114) |
Nov
(85) |
Dec
(79) |
| 2006 |
Jan
(103) |
Feb
(89) |
Mar
(41) |
Apr
(122) |
May
(94) |
Jun
(62) |
Jul
(491) |
Aug
(95) |
Sep
(279) |
Oct
(167) |
Nov
(156) |
Dec
(624) |
| 2007 |
Jan
(364) |
Feb
(271) |
Mar
(315) |
Apr
(378) |
May
(193) |
Jun
(235) |
Jul
(548) |
Aug
(388) |
Sep
(725) |
Oct
(369) |
Nov
(322) |
Dec
(487) |
| 2008 |
Jan
(552) |
Feb
(628) |
Mar
(817) |
Apr
(746) |
May
(1224) |
Jun
(1971) |
Jul
(1191) |
Aug
(876) |
Sep
(491) |
Oct
(267) |
Nov
(354) |
Dec
(747) |
| 2009 |
Jan
(322) |
Feb
(442) |
Mar
(573) |
Apr
(303) |
May
(401) |
Jun
(340) |
Jul
(403) |
Aug
(238) |
Sep
(267) |
Oct
(347) |
Nov
(456) |
Dec
(184) |
| 2010 |
Jan
(246) |
Feb
(432) |
Mar
(598) |
Apr
(250) |
May
(498) |
Jun
(715) |
Jul
(1282) |
Aug
(350) |
Sep
(504) |
Oct
(632) |
Nov
(870) |
Dec
(170) |
| 2011 |
Jan
(206) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Ted L. <ted...@us...> - 2010-11-09 01:38:52
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1709/docs Modified Files: gerrit_working_model.txt Log Message: amdended docs on configuring replication for gerrit to SF Index: gerrit_working_model.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/gerrit_working_model.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gerrit_working_model.txt 8 Nov 2010 06:24:12 -0000 1.9 --- gerrit_working_model.txt 9 Nov 2010 01:38:44 -0000 1.10 *************** *** 73,81 **** - register a user for gerrit with sourceforge, i.e. we're using ge...@os... for all the emails so we might as well register that user for replication. - need to add gerrit public key to sourceforge ! - add config file gerrit/review_site/replication.config with contents ! [remote "sourceforget"] ! url = ssh://osc...@os...:/oscarmcmaster/{name}/ ! ** not finished here yet ---------------- --- 73,81 ---- - register a user for gerrit with sourceforge, i.e. we're using ge...@os... for all the emails so we might as well register that user for replication. - need to add gerrit public key to sourceforge ! - add config file gerrit/review_site/etc/replication.config with contents ! [remote "sourceforge"] ! url = ssh://osc...@os.../gitroot/oscarmcmaster/${name} + and it appears to all work! amazing :) ---------------- |
|
From: annie <ann...@us...> - 2010-11-09 00:08:51
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv16497/web/casemgmt Modified Files: Tag: RELEASE_10_06 newCaseManagementView.jsp Log Message: fixed NullPointer Exception Index: newCaseManagementView.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/newCaseManagementView.jsp,v retrieving revision 1.91.4.5 retrieving revision 1.91.4.6 diff -C2 -d -r1.91.4.5 -r1.91.4.6 *** newCaseManagementView.jsp 20 Oct 2010 19:56:18 -0000 1.91.4.5 --- newCaseManagementView.jsp 9 Nov 2010 00:08:43 -0000 1.91.4.6 *************** *** 569,573 **** <% //display last saved note for editing ! if (note.getNoteId().intValue() == savedId) { found = true; --- 569,573 ---- <% //display last saved note for editing ! if (note.getNoteId() !=null && !"".equals(note.getNoteId()) && note.getNoteId().equals(savedId)) { found = true; |
|
From: Ted L. <ted...@us...> - 2010-11-08 23:57:09
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14277/build/tasks/src Modified Files: GrepStuffDirectoryWalker.java Log Message: added exclude for JS function name Index: GrepStuffDirectoryWalker.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src/GrepStuffDirectoryWalker.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** GrepStuffDirectoryWalker.java 25 Oct 2010 21:25:50 -0000 1.12 --- GrepStuffDirectoryWalker.java 8 Nov 2010 23:57:01 -0000 1.13 *************** *** 65,70 **** checkContains(relativePath, fileContents, "LogManager.getLogger(", "use MiscUtils.getLogger() instead"); checkContains(relativePath, fileContents, "HibernateDaoSupport", "use jpa"); - checkContains(relativePath, fileContents, "Hashtable", "excessively rare that this is required, usually HashMap is the better choice"); - checkContains(relativePath, fileContents, "Vector", "excessively rare that this is required, usually ArrayList is the better choice"); checkContains(relativePath, fileContents, "ArrayList()", "use generics"); checkContains(relativePath, fileContents, "HashSet()", "use generics"); --- 65,68 ---- *************** *** 76,79 **** --- 74,83 ---- checkContains(relativePath, fileContents, "com.Ostermiller", "use org.apache libraries instead, duplicated libs and apache is... more standard (if that's a word)"); + checkContains(relativePath, fileContents, "Vector", "excessively rare that this is required, usually ArrayList is the better choice"); + + if (fileContents.contains("Hashtable") && !fileContents.contains("initHashtableWithList")) { + violations.put("Hashtable" + ", " + "excessively rare that this is required, usually HashMap is the better choice", relativePath); + } + // --- hack for ignore case comparison --- checkContains(relativePath, fileContentsLowered, "latin-1", "use utf-8"); |
|
From: Peter HC <pet...@us...> - 2010-11-08 22:43:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30911 Modified Files: billingONEditPrivateCode.jsp Log Message: fixed html errors by moving td to enclose unclosed input Index: billingONEditPrivateCode.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingONEditPrivateCode.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** billingONEditPrivateCode.jsp 2 Jul 2010 18:22:19 -0000 1.5 --- billingONEditPrivateCode.jsp 8 Nov 2010 22:43:12 -0000 1.6 *************** *** 305,310 **** value="<%=prop.getProperty("value", "")%>" size='8' maxlength='8'>Add GST<input type="checkbox" name="gstCheck" id="gstCheck" ! onclick="setFlag()" /> (format: xx.xx, e.g. 18.20)</td> ! <input type="hidden" value="" id="gstFlag" name="gstFlag" /> </tr> <tr> --- 305,310 ---- value="<%=prop.getProperty("value", "")%>" size='8' maxlength='8'>Add GST<input type="checkbox" name="gstCheck" id="gstCheck" ! onclick="setFlag()" /> (format: xx.xx, e.g. 18.20) ! <input type="hidden" value="" id="gstFlag" name="gstFlag" /></td> </tr> <tr> |
|
From: Peter HC <pet...@us...> - 2010-11-08 22:42:01
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30755 Modified Files: formannualfemaleprint.jsp Log Message: fixed html errors by deleting empty unclosed tags Index: formannualfemaleprint.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formannualfemaleprint.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** formannualfemaleprint.jsp 26 Oct 2010 00:22:34 -0000 1.7 --- formannualfemaleprint.jsp 8 Nov 2010 22:41:52 -0000 1.8 *************** *** 523,529 **** </tr> </table> ! </td> ! </tr> ! </table> <table class="Header"> --- 523,527 ---- </tr> </table> ! <table class="Header"> |
|
From: Peter HC <pet...@us...> - 2010-11-08 22:40:55
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30589 Modified Files: Index2.jsp Log Message: fixed regex errors by escaping \ and " Index: Index2.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/Index2.jsp,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** Index2.jsp 22 Sep 2010 09:41:04 -0000 1.56 --- Index2.jsp 8 Nov 2010 22:40:46 -0000 1.57 *************** *** 327,332 **** text = text.replace(/\\u003E/g, ">"); text = text.replace(/\\u003C/g, "<"); ! text = text.replace(/\\u005C/g, "\"); ! text = text.replace(/\\u0022/g, """); text = text.replace(/\\u0027/g, "'"); --- 327,332 ---- text = text.replace(/\\u003E/g, ">"); text = text.replace(/\\u003C/g, "<"); ! text = text.replace(/\\u005C/g, "\\"); ! text = text.replace(/\\u0022/g, "\""); text = text.replace(/\\u0027/g, "'"); *************** *** 390,395 **** document.encForm.enTextarea.value = document.encForm.enTextarea.value.replace(/\\u003E/g, ">"); document.encForm.enTextarea.value = document.encForm.enTextarea.value.replace(/\\u003C/g, "<"); ! document.encForm.enTextarea.value = document.encForm.enTextarea.value.replace(/\\u005C/g, "\"); ! document.encForm.enTextarea.value = document.encForm.enTextarea.value.replace(/\\u0022/g, """); document.encForm.enTextarea.value = document.encForm.enTextarea.value.replace(/\\u0027/g, "'"); window.setTimeout("document.encForm.enTextarea.scrollTop=2147483647", 0); // setTimeout is needed to allow browser to realize that text field has been updated --- 390,395 ---- document.encForm.enTextarea.value = document.encForm.enTextarea.value.replace(/\\u003E/g, ">"); document.encForm.enTextarea.value = document.encForm.enTextarea.value.replace(/\\u003C/g, "<"); ! document.encForm.enTextarea.value = document.encForm.enTextarea.value.replace(/\\u005C/g, "\\"); ! document.encForm.enTextarea.value = document.encForm.enTextarea.value.replace(/\\u0022/g, "\""); document.encForm.enTextarea.value = document.encForm.enTextarea.value.replace(/\\u0027/g, "'"); window.setTimeout("document.encForm.enTextarea.scrollTop=2147483647", 0); // setTimeout is needed to allow browser to realize that text field has been updated |
|
From: Peter HC <pet...@us...> - 2010-11-08 22:30:23
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv28377 Modified Files: eformGenerator.jsp Log Message: eFormGenerator fully i18n taged n=122 Index: eformGenerator.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform/eformGenerator.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** eformGenerator.jsp 28 Oct 2010 16:14:03 -0000 1.8 --- eformGenerator.jsp 8 Nov 2010 22:30:15 -0000 1.9 *************** *** 27,33 **** <%@page import="org.oscarehr.util.MiscUtils"%> <html> <head> ! <title>OSCAR e-Form Generator</title> <style type="text/css" media="print"> --- 27,34 ---- <%@page import="org.oscarehr.util.MiscUtils"%> + <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <html> <head> ! <title> <bean:message key="eFormGenerator.title"/></title> <style type="text/css" media="print"> *************** *** 2436,2440 **** <!-- resetAll() --> ! <body onload="init(); resetAll();"> <img name="BGImage" id="BGImage" style="position: absolute; left: 0px; top: 0px;" --- 2437,2441 ---- <!-- resetAll() --> ! <body onload="init(); resetAll(); hide('all')"> <img name="BGImage" id="BGImage" style="position: absolute; left: 0px; top: 0px;" *************** *** 2446,2450 **** ! <h1>E-form Generator</h1> <!-- this form used for injecting html in to Edit E-Form--> --- 2447,2451 ---- ! <h1><bean:message key="eFormGenerator.title"/></h1> <!-- this form used for injecting html in to Edit E-Form--> *************** *** 2458,2466 **** <hr> ! <span class="h2">1. Load Image:</span> <a onclick="show('Section1');">Expand</a>/<a onclick="hide('Section1');">Collapse</a> <div id="Section1"> <p><select name="imageName" id="imageName"> ! <option value="" >choose an image...</option> <% /** --- 2459,2471 ---- + <span class="h1"><bean:message key="eFormGenerator.title"/></span> + <a onclick="show('all');"><bean:message key="eFormGenerator.expandAll"/></a>/ + <a onclick="hide('all');"><bean:message key="eFormGenerator.collapseAll"/></a> + <hr> ! <span class="h2">1. <bean:message key="eFormGenerator.loadImage"/>:</span> <a onclick="show('Section1');"><bean:message key="eFormGenerator.expand"/></a>/<a onclick="hide('Section1');"><bean:message key="eFormGenerator.collapse"/></a> <div id="Section1"> <p><select name="imageName" id="imageName"> ! <option value="" ><bean:message key="eFormGenerator.imageChooseSelect"/>...</option> <% /** *************** *** 2489,2500 **** <!-- <p><b>Image Name:</b><input type="text" name="imageName" id="imageName"></p> --> ! <p> - If the picture does not appear on the list upload it.</p> <p><b>Orientation of form:</b><br> ! <input type="radio" name="Orientation" id="OrientPortrait" value="750" checked>Portrait (image width should be 1500 pixels, resized to 750 pixels on screen)<br> ! <input type="radio" name="Orientation" id="OrientLandscape" value="1000">Landscape (image width should be 2000 pixels, resized to 1000 pixels on screen)<br> ! <input type="radio" name="Orientation" id="OrientCustom" value="CustomWidth">Custom <input type="text" name="OrientCustomValue" id="OrientCustomValue" width="100"> (enter an integer)<br> ! <input type="button" value="Load Image" onClick="loadImage();"> </p> ! <p>If the eform image extends past the red outline, you've cropped the image too long and it won't fit on a letter-sized printout. Try typing a number smaller than 750 in the "Custom" field.</p> </div> --- 2494,2505 ---- <!-- <p><b>Image Name:</b><input type="text" name="imageName" id="imageName"></p> --> ! <p> - <bean:message key="eFormGenerator.imageUploadPrompt"/> <bean:message key="eFormGenerator.imageUploadLink"/></p> <p><b>Orientation of form:</b><br> ! <input type="radio" name="Orientation" id="OrientPortrait" value="750" checked><bean:message key="eFormGenerator.imagePortrait"/><br> ! <input type="radio" name="Orientation" id="OrientLandscape" value="1000"><bean:message key="eFormGenerator.imageLandscape"/><br> ! <input type="radio" name="Orientation" id="OrientCustom" value="CustomWidth"><bean:message key="eFormGenerator.imageCustom"/> <input type="text" name="OrientCustomValue" id="OrientCustomValue" width="100"> <bean:message key="eFormGenerator.imageEnterInteger"/><br> ! <input type="button" value=<bean:message key="eFormGenerator.imageLoadButton"/> onClick="loadImage();"> </p> ! <p><bean:message key="eFormGenerator.image.RedOutlinehint"/></p> </div> *************** *** 2502,2524 **** <hr> ! <span class='h2'>2. eForm Name:</span> <a onclick="show('Section2');">Expand</a>/<a onclick="hide('Section2');">Collapse</a> <div id="Section2"> ! <p>Enter a name for the form here:<input type="text" name="eFormName" id="eFormName"></p> </div> <hr> ! <span class='h2'>3. Special Case With Gender Checkboxes:</span><a onclick="show('Section3');">Expand</a>/<a onclick="hide('Section3');">Collapse</a> <div id="Section3"> ! <p>Gender checkboxes used in this form? If yes, click here <input name="preCheckGender" id="preCheckGender" type="checkbox" onclick="toggleView(this.checked,'Section3a');"></p> <div id="Section3a" style="display:none"> <table> <tr> ! <td><span><b>Male</b>: </span></td> ! <td><input name="Male" id="Male" type="button" value="Click this, then click the top left corner of the male checkbox" onclick="SetSwitchOn(this.id);"></td> </tr> <tr> ! <td><span><b>Female</b>:</span></td> ! <td><input name="Female" id="Female" type="button" value="Click this, then click the top left corner of the female checkbox" onclick="SetSwitchOn(this.id);"></td> </tr> </table> --- 2507,2529 ---- <hr> ! <span class='h2'>2. <bean:message key="eFormGenerator.eFormName"/></span> <a onclick="show('Section2');"><bean:message key="eFormGenerator.expand"/></a>/<a onclick="hide('Section2');"><bean:message key="eFormGenerator.collapse"/></a> <div id="Section2"> ! <p><bean:message key="eFormGenerator.nameInstruction"/><input type="text" name="eFormName" id="eFormName"></p> </div> <hr> ! <span class='h2'>3. <bean:message key="eFormGenerator.gender"/></span> <a onclick="show('Section3');"><bean:message key="eFormGenerator.expand"/></a>/<a onclick="hide('Section3');"><bean:message key="eFormGenerator.collapse"/></a> <div id="Section3"> ! <p><bean:message key="eFormGenerator.genderCheckbox"/> <input name="preCheckGender" id="preCheckGender" type="checkbox" onclick="toggleView(this.checked,'Section3a');"></p> <div id="Section3a" style="display:none"> <table> <tr> ! <td><span><b><bean:message key="eFormGenerator.genderMale"/></b>: </span></td> ! <td><input name="Male" id="Male" type="button" value='<bean:message key="eFormGenerator.genderMaleButton"/>' onclick="SetSwitchOn(this.id);"></td> </tr> <tr> ! <td><span><b><bean:message key="eFormGenerator.genderFemale"/></b>:</span></td> ! <td><input name="Female" id="Female" type="button" value='<bean:message key="eFormGenerator.genderFemaleButton"/>' onclick="SetSwitchOn(this.id);"></td> </tr> </table> *************** *** 2526,2556 **** </div> <hr> ! <span class='h2'>4. Special Case With Signatures:</span><a onclick="show('Section4');">Expand</a>/<a onclick="hide('Section4');">Collapse</a> <div id="Section4"> <p> <input type="checkbox" name="AddSignature" id="AddSignature" ! onclick=" toggleView(this.checked,'Section4a');toggleView(this.checked,'Section4b');">Add Signature to this form<br> <div id="Section4a" style="display:none"> ! <input type="radio" name="SignatureType" id="AutoSign" value="AutoSign" onclick="show('Section4aa'); show('Section4ab'); hide('Section4ba');"><span>Automatically load user's signature images:</span><br> </div> <div id="Section4aa" style="display:none"> <ul> ! <li>User Name(i.e. oscarDB=current_user) - as a shortcut, you may enter a short segment of the name, as long as this segment is unique among all the users: <input type="text" name="UserList" id="UserList" style="width:200px;"></li> ! <li>Corresponding signature image file: <input type="text" name="SignatureList" id="SignatureList" style="width:200px;"></li> ! <input type="button" name="AddToUserSignatureList" id="AddToUserSignatureList" value="Add to List" onclick="addToUserSignatureList();"> ! <input type="button" name="EmptyUserSignatureList" id="EmptyUserSignatureList" value="Empty List" onclick="emptyUserSignaturelist()"><br> <ul name="UserSignatureList" id="UserSignatureList" style="list-style-type:none; list-style: none; margin-left: 0; padding-left: 1em; text-indent: -1em"></ul> </ul> </div> <div id="Section4ab" style="display:none"> ! <input type="button" name="AddSignatureBox1" id="AddSignatureBox1" style="width:400px" value="Click here, then drag a box around the signature area" onclick="SetSwitchOn('SignatureBox');"> </div> <div id="Section4b" style="display:none"> ! <input type="radio" name="SignatureType" id="DrawSign" value="DrawSign" onclick="show('Section4ba'); hide('Section4aa'); hide('Section4ab');"><span>Add a drawing area to "sign" a signature on the fly<span> </div> <div id="Section4ba" style="display:none"> ! <input type="button" name="AddSignatureBox2" id="AddSignatureBox2" style="width:400px" value="Click here, then drag a box around the signature area" onclick="SetSwitchOn('SignatureBox');"> </div> </p> --- 2531,2561 ---- </div> <hr> ! <span class='h2'>4. <bean:message key="eFormGenerator.signature"/></span><a onclick="show('Section4');"><bean:message key="eFormGenerator.expand"/></a>/<a onclick="hide('Section4');"><bean:message key="eFormGenerator.collapse"/></a> <div id="Section4"> <p> <input type="checkbox" name="AddSignature" id="AddSignature" ! onclick=" toggleView(this.checked,'Section4a');toggleView(this.checked,'Section4b');"><bean:message key="eFormGenerator.signatureCheckbox"/><br> <div id="Section4a" style="display:none"> ! <input type="radio" name="SignatureType" id="AutoSign" value="AutoSign" onclick="show('Section4aa'); show('Section4ab'); hide('Section4ba');"><span><bean:message key="eFormGenerator.signatureLoad"/></span><br> </div> <div id="Section4aa" style="display:none"> <ul> ! <li><bean:message key="eFormGenerator.signatureFragment"/> <input type="text" name="UserList" id="UserList" style="width:200px;"></li> ! <li><bean:message key="eFormGenerator.signatureImage"/> <input type="text" name="SignatureList" id="SignatureList" style="width:200px;"></li> ! <input type="button" name="AddToUserSignatureList" id="AddToUserSignatureList" value="<bean:message key="eFormGenerator.signatureAddButton"/>" onclick="addToUserSignatureList();"> ! <input type="button" name="EmptyUserSignatureList" id="EmptyUserSignatureList" value="<bean:message key="eFormGenerator.signatureEmptyButton"/>" onclick="emptyUserSignaturelist()"><br> <ul name="UserSignatureList" id="UserSignatureList" style="list-style-type:none; list-style: none; margin-left: 0; padding-left: 1em; text-indent: -1em"></ul> </ul> </div> <div id="Section4ab" style="display:none"> ! <input type="button" name="AddSignatureBox1" id="AddSignatureBox1" style="width:400px" value="<bean:message key="eFormGenerator.signatureLocationButton"/>" onclick="SetSwitchOn('SignatureBox');"> </div> <div id="Section4b" style="display:none"> ! <input type="radio" name="SignatureType" id="DrawSign" value="DrawSign" onclick="show('Section4ba'); hide('Section4aa'); hide('Section4ab');"><span><bean:message key="eFormGenerator.signatureFreehand"/><span> </div> <div id="Section4ba" style="display:none"> ! <input type="button" name="AddSignatureBox2" id="AddSignatureBox2" style="width:400px" value="<bean:message key="eFormGenerator.signatureLocationButton"/>" onclick="SetSwitchOn('SignatureBox');"> </div> </p> *************** *** 2558,2578 **** <hr> ! <span class='h2'>5. Add in form input fields (one-by-one)</span> <a onclick="show('Section5');">Expand</a>/<a onclick="hide('Section5');">Collapse</a></span> <div id="Section5"> ! <span class='h3'>a) Select An Input Type</span> <p> ! <input type="radio" name="inputType" id="Text" value="text" onclick="hide('SectionPrecheck');show('SectionCustomText');show('SectionDatabase');show('SectionImportMeasurements');SetSwitchOn(this.id);">Single-line text input ! <input type="radio" name="inputType" id="Textbox" value="textarea" onclick="hide('SectionPrecheck');show('SectionCustomText');show('SectionDatabase');show('SectionImportMeasurements');SetSwitchOn(this.id);">Multi-line text input ! <input type="radio" name="inputType" id="Checkbox" value="checkbox" onclick="show('SectionPrecheck');hide('SectionCustomText');hide('SectionDatabase');hide('SectionImportMeasurements');SetSwitchOn(this.id);">Checkbox </p> ! <span class='h3'>b) Auto-populating Input Box</span> <ul style="list-style-type:none"> <li id='SectionCustomText' style="display:block"> ! <input type="radio" name="AutoPopType" id="AutoPopCustom" value="custom">Custom text:<input type="text" name="inputValue" id="inputValue" value=""></li> <li id='SectionDatabase' style="display:block"> ! <input type="radio" name="AutoPopType" id="AutoPopDatabase" value="database">From Oscar Database: <select name="oscarDB" id="oscarDB"> ! <option value="" >----NONE----</option> <% EFormLoader names = EFormLoader.getInstance(); --- 2563,2583 ---- <hr> ! <span class='h2'>5. <bean:message key="eFormGenerator.input"/></span> <a onclick="show('Section5');"><bean:message key="eFormGenerator.expand"/></a>/<a onclick="hide('Section5');"><bean:message key="eFormGenerator.collapse"/></a></span> <div id="Section5"> ! <span class='h3'><bean:message key="eFormGenerator.inputType"/></span> <p> ! <input type="radio" name="inputType" id="Text" value="text" onclick="hide('SectionPrecheck');show('SectionCustomText');show('SectionDatabase');show('SectionImportMeasurements');SetSwitchOn(this.id);"><bean:message key="eFormGenerator.inputTypeText"/> ! <input type="radio" name="inputType" id="Textbox" value="textarea" onclick="hide('SectionPrecheck');show('SectionCustomText');show('SectionDatabase');show('SectionImportMeasurements');SetSwitchOn(this.id);"><bean:message key="eFormGenerator.inputTypeTextArea"/> ! <input type="radio" name="inputType" id="Checkbox" value="checkbox" onclick="show('SectionPrecheck');hide('SectionCustomText');hide('SectionDatabase');hide('SectionImportMeasurements');SetSwitchOn(this.id);"><bean:message key="eFormGenerator.inputTypeCheckbox"/> </p> ! <span class='h3'><bean:message key="eFormGenerator.inputAuto"/></span> <ul style="list-style-type:none"> <li id='SectionCustomText' style="display:block"> ! <input type="radio" name="AutoPopType" id="AutoPopCustom" value="custom"><bean:message key="eFormGenerator.inputTypeCustom"/><input type="text" name="inputValue" id="inputValue" value=""></li> <li id='SectionDatabase' style="display:block"> ! <input type="radio" name="AutoPopType" id="AutoPopDatabase" value="database"><bean:message key="eFormGenerator.inputTypeData"/> <select name="oscarDB" id="oscarDB"> ! <option value="" ><bean:message key="eFormGenerator.inputTypeDataButton"/></option> <% EFormLoader names = EFormLoader.getInstance(); *************** *** 2586,2596 **** </select> </li> <li id="SectionImportMeasurements" style="diplay:block;"> ! <input type="radio" name="AutoPopType" id="AutoPopMeasurements" value="measurements">Importing from Measurements:<br> <table> <tr> ! <td><p>Measurement Type:</p></td> <td><p> <select name="MeasurementList" id="MeasurementList"> ! <option value="" selected="selected">--NONE--</option> <option value="HT">HT</option> <option value="WT">WT</option> --- 2591,2601 ---- </select> </li> <li id="SectionImportMeasurements" style="diplay:block;"> ! <input type="radio" name="AutoPopType" id="AutoPopMeasurements" value="measurements"><bean:message key="eFormGenerator.inputTypeMeasurements"/><br> <table> <tr> ! <td><p><bean:message key="eFormGenerator.inputTypeMeasurementsType"/></p></td> <td><p> <select name="MeasurementList" id="MeasurementList"> ! <option value="" selected="selected"><bean:message key="eFormGenerator.inputTypeMeasurementsButton"/></option> <option value="HT">HT</option> <option value="WT">WT</option> *************** *** 2612,2624 **** </select> <br> ! , or custom <input type="text" name="MeasurementCustom" id="MeasurementCustom" style="width:50px;"> </p> </td> <td> ! <p>Field: <select name="MeasurementField" id="MeasurementField"> ! <option value="value">Value</option> ! <option value="dateObserved">Date Observed</option> ! <option value="comments">Comments</option> </select> </p> --- 2617,2629 ---- </select> <br> ! <bean:message key="eFormGenerator.inputTypeMeasurementsCustom"/><input type="text" name="MeasurementCustom" id="MeasurementCustom" style="width:50px;"> </p> </td> <td> ! <p><bean:message key="eFormGenerator.inputTypeMeasurementsField"/> <select name="MeasurementField" id="MeasurementField"> ! <option value="value"><bean:message key="eFormGenerator.inputTypeMeasurementsFieldButtonValue"/></option> ! <option value="dateObserved"><bean:message key="eFormGenerator.inputTypeMeasurementsFieldButtonDateObserved"/></option> ! <option value="comments"><bean:message key="eFormGenerator.inputTypeMeasurementsFieldButtonComment"/></option> </select> </p> *************** *** 2632,2691 **** ! <span class='h3'>c) Formating The Input Box</span> <p> ! Font Family: <select id="fontFamily"> ! <option value="sans-serif">sans-serif</option> ! <option value="serif">serif</option> ! <option value="monospace">monospace</option> </select> ! Font Style: <select id="fontStyle"> ! <option value="normal">normal</option> ! <option value="italic">italic</option> </select> ! Font Weight: <select id="fontWeight"> ! <option value="normal">normal</option> ! <option value="bold">bold</option> ! <option value="bolder">bolder</option> ! <option value="lighter">lighter</option> </select> <br> ! Font Size:<input type="text" name="fontSize" id="fontSize" style="width:50px" value="12">(in px, usually 12-14) ! Horizontal Alignment: <select id="textAlign"> ! <option value="left">Left</option> ! <option value="center">Center</option> ! <option value="right">Right</option> ! <option value="justify">Justify</option> </select> </p> ! <p>Background Color: <select id="bgColor"> ! <option value="transparent">transparent</option> ! <option value="white">white</option> </select><br> ! - Useful to have a white background to cover-up lines within the input field </p> ! <span class='h3'>c) Naming the input field:</span> ! <p>i)<input type="radio" name="InputNameType" id="InputNameAuto" value="Auto" checked>Automatic Sequential Naming (quicker method for most cases).<br> ! - automatic name prefix:<input type="text" name="AutoNamePrefix" id="AutoNamePrefix" style="width:100px" value="AutoName">(One Continuous Word)<br> ! ii)<input type="radio" name="InputNameType" id="InputNameCustom" value="Custom">Custom <font style="color:red;">UNIQUE</font> Name: <input type="text" name="inputName" id="inputName"> <br> ! - Must be <i>one continuous word</i> with letters/numbers only (<i>no spaces/symbols</i>)<br> ! - Use custom naming to easily identify the corresponding html code if you're going to be editing the code later on <br> ! iii)<input type="radio" name="InputNameType" id="InputNameMeasurement" value="Measurement">If you would like to export the value of this input field to <b>Measurements</b>, select the Measurement Type and Field here:<br> <table> <tr> ! <td><p>Measurement Type:</p></td> <td><p> <select name="ExportMeasurementList" id="ExportMeasurementList"> ! <option value="" selected="selected">--NONE--</option> <option value="HT">HT</option> <option value="WT">WT</option> --- 2637,2696 ---- ! <span class='h3'><bean:message key="eFormGenerator.inputFormat"/></span> <p> ! <bean:message key="eFormGenerator.inputFormatFont"/> <select id="fontFamily"> ! <option value="sans-serif"><bean:message key="eFormGenerator.inputFormatSelectSans"/></option> ! <option value="serif"><bean:message key="eFormGenerator.inputFormatSelectSerif"/></option> ! <option value="monospace"><bean:message key="eFormGenerator.inputFormatSelectMono"/></option> </select> ! <bean:message key="eFormGenerator.inputFormatStyle"/> <select id="fontStyle"> ! <option value="normal"><bean:message key="eFormGenerator.inputFormatStyleNormal"/></option> ! <option value="italic"><bean:message key="eFormGenerator.inputFormatStyleItalic"/></option> </select> ! <bean:message key="eFormGenerator.inputFormatWeight"/> <select id="fontWeight"> ! <option value="normal"><bean:message key="eFormGenerator.inputFormatStyleNormal"/></option> ! <option value="bold"><bean:message key="eFormGenerator.inputFormatWeightBold"/></option> ! <option value="bolder"><bean:message key="eFormGenerator.inputFormatWeightBolder"/></option> ! <option value="lighter"><bean:message key="eFormGenerator.inputFormatWeightLighter"/></option> </select> <br> ! <bean:message key="eFormGenerator.inputFormatSize"/><input type="text" name="fontSize" id="fontSize" style="width:50px" value="12"><bean:message key="eFormGenerator.inputFormatSizehint"/> ! <bean:message key="eFormGenerator.inputFormatAlign"/> <select id="textAlign"> ! <option value="left"><bean:message key="eFormGenerator.inputFormatAlignLeft"/></option> ! <option value="center"><bean:message key="eFormGenerator.inputFormatAlignCenter"/></option> ! <option value="right"><bean:message key="eFormGenerator.inputFormatAlignRight"/></option> ! <option value="justify"><bean:message key="eFormGenerator.inputFormatAlignJustify"/></option> </select> </p> ! <p><bean:message key="eFormGenerator.inputFormatBackground"/> <select id="bgColor"> ! <option value="transparent"><bean:message key="eFormGenerator.inputFormatBackgroundTransparent"/></option> ! <option value="white"><bean:message key="eFormGenerator.inputFormatBackgroundWhite"/></option> </select><br> ! - <bean:message key="eFormGenerator.inputFormatBackgroundhint"/> </p> ! <span class='h3'><bean:message key="eFormGenerator.inputName"/></span> ! <p><input type="radio" name="InputNameType" id="InputNameAuto" value="Auto" checked><bean:message key="eFormGenerator.inputNameSeq"/><br> ! - <bean:message key="eFormGenerator.inputNameSeqPrefix"/><input type="text" name="AutoNamePrefix" id="AutoNamePrefix" style="width:100px" value="AutoName"><br> ! <input type="radio" name="InputNameCustom" id="InputNameCustom" value="Custom"><bean:message key="eFormGenerator.inputNameSeqCustom"/> <input type="text" name="inputName" id="inputName"> <br> ! - <bean:message key="eFormGenerator.inputNameSeqCustomhint1"/><br> ! - <bean:message key="eFormGenerator.inputNameSeqCustomhint2"/> <br> ! <input type="radio" name="InputNameType" id="InputNameMeasurement" value="Measurement"><bean:message key="eFormGenerator.inputNameMeasurement"/><br> <table> <tr> ! <td><p><bean:message key="eFormGenerator.inputNameMeasurementType"/></p></td> <td><p> <select name="ExportMeasurementList" id="ExportMeasurementList"> ! <option value="" selected="selected"><bean:message key="eFormGenerator.inputNameMeasurementButton"/></option> <option value="HT">HT</option> <option value="WT">WT</option> *************** *** 2707,2719 **** </select> <br> ! , or custom <input type="text" name="ExportMeasurementCustom" id="ExportMeasurementCustom" style="width:50px;"> </p> </td> <td> ! <p>Field: <select name="ExportMeasurementField" id="ExportMeasurementField"> ! <option value="value">Value</option> ! <option value="dateObserved">Date Observed</option> ! <option value="comments">Comments</option> </select> </p> --- 2712,2724 ---- </select> <br> ! <bean:message key="eFormGenerator.inputNameMeasurementsCustom"/> <input type="text" name="ExportMeasurementCustom" id="ExportMeasurementCustom" style="width:50px;"> </p> </td> <td> ! <p><bean:message key="eFormGenerator.inputNameMeasurementsField"/> <select name="ExportMeasurementField" id="ExportMeasurementField"> ! <option value="value"><bean:message key="eFormGenerator.inputTypeMeasurementsFieldButtonValue"/></option> ! <option value="dateObserved"><bean:message key="eFormGenerator.inputTypeMeasurementsFieldButtonDateObserved"/></option> ! <option value="comments"><bean:message key="eFormGenerator.inputTypeMeasurementsFieldButtonComment"/></option> </select> </p> *************** *** 2723,2768 **** </p> ! <span class='h3'>d) Drawing the input fields</span> <br> ! <span class='h4'>For one- and multi-lined textboxes:</span> <p> ! - Drag a box from the top left corner to the bottom right corner of the box.<br> </p> ! <span class='h4'>For checkboxes</span> <p> ! - Click on the top left corner of the checkbox<br> </p> ! <p><input type="button" onclick="Undo();" value="Undo"></p> ! <p>Repeat step # 3 until all input boxes are done.</p> </div> <hr> ! <span class='h2'>6. Fine-tuning The Input Fields</span><a onclick="show('Section6');">Expand</a>/<a onclick="hide('Section6');">Collapse</a> <div id="Section6"> ! <input type="button" value="Show/Hide Input Names" onclick="ToggleInputName();"><br> <table style="text-align:center; border: 1px solid black;"> <tr> <td style="background-color:#dddddd;"> ! <input type="button" value="Uncheck all" onclick="uncheckList('InputChecklist');"><br> ! <input type="button" value="Check all" onclick="checkList('InputChecklist');"> </td> <td> ! <span>UP</span><br> ! <input type="button" value="Align" style="width:100px;" onclick="alignInput('top');"><br> ! <input type="button" value="Shift" style="width:100px;" onclick="changeInput('up',10);"><br> ! <input type="button" value="Nudge" style="width:100px;" onclick="changeInput('up',1);"> </td> <td style="background-color:#dddddd;"> ! <input type="button" value="Delete" Style="width:100px;" onclick="deleteInput();"> </td> </tr> <tr> <td> ! <span>LEFT</span><br> ! <input type="button" value="Align" style="width:50px;" onclick="alignInput('left');"> ! <input type="button" value="Shift" style="width:50px;" onclick="changeInput('left',10);"> ! <input type="button" value="Nudge" style="width:50px;" onclick="changeInput('left',1);"> </td> <td style="text-align:left;"> --- 2728,2773 ---- </p> ! <span class='h3'><bean:message key="eFormGenerator.inputDraw"/></span> <br> ! <span class='h4'><bean:message key="eFormGenerator.inputDrawText"/></span> <p> ! - <bean:message key="eFormGenerator.inputDrawTexthint"/><br> </p> ! <span class='h4'><bean:message key="eFormGenerator.inputDrawCheckbox"/></span> <p> ! - <bean:message key="eFormGenerator.inputDrawCheckboxhint"/><br> </p> ! <p><input type="button" onclick="Undo();" value='<bean:message key="eFormGenerator.inputDrawUndoButton"/>'></p> ! <p><bean:message key="eFormGenerator.inputDrawhint"/></p> </div> <hr> ! <span class='h2'>6. <bean:message key="eFormGenerator.tuning"/></span><a onclick="show('Section6');"><bean:message key="eFormGenerator.expand"/></a>/<a onclick="hide('Section6');"><bean:message key="eFormGenerator.collapse"/></a> <div id="Section6"> ! <input type="button" value='<bean:message key="eFormGenerator.tuningShowButton"/>' onclick="ToggleInputName();"><br> <table style="text-align:center; border: 1px solid black;"> <tr> <td style="background-color:#dddddd;"> ! <input type="button" value='<bean:message key="eFormGenerator.tuningNoneButton"/>' onclick="uncheckList('InputChecklist');"><br> ! <input type="button" value='<bean:message key="eFormGenerator.tuningAllButton"/>' onclick="checkList('InputChecklist');"> </td> <td> ! <span><bean:message key="eFormGenerator.tuningUpButton"/></span><br> ! <input type="button" value='<bean:message key="eFormGenerator.tuningAlignButton"/>' style="width:100px;" onclick="alignInput('top');"><br> ! <input type="button" value='<bean:message key="eFormGenerator.tuningShiftButton"/>' style="width:100px;" onclick="changeInput('up',10);"><br> ! <input type="button" value='<bean:message key="eFormGenerator.tuningNudgeButton"/>' style="width:100px;" onclick="changeInput('up',1);"> </td> <td style="background-color:#dddddd;"> ! <input type="button" value='<bean:message key="eFormGenerator.tuningDeleteButton"/>' Style="width:100px;" onclick="deleteInput();"> </td> </tr> <tr> <td> ! <span><bean:message key="eFormGenerator.tuningLeft"/></span><br> ! <input type="button" value='<bean:message key="eFormGenerator.tuningAlignButton"/>' style="width:50px;" onclick="alignInput('left');"> ! <input type="button" value='<bean:message key="eFormGenerator.tuningShiftButton"/>' style="width:50px;" onclick="changeInput('left',10);"> ! <input type="button" value='<bean:message key="eFormGenerator.tuningNudgeButton"/>' style="width:50px;" onclick="changeInput('left',1);"> </td> <td style="text-align:left;"> *************** *** 2770,2796 **** </td> <td> ! <span>RIGHT</span><br> ! <input type="button" value="Nudge" style="width:50px;" onclick="changeInput('right',1);"> ! <input type="button" value="Shift" style="width:50px;" onclick="changeInput('right',10);"> ! <input type="button" value="Align" style="width:50px;" onclick="alignInput('right');"> </td> </tr> <tr> <td style="background-color:#dddddd;"> ! <span>WIDTH</span><br> ! <input type="button" value="Increase" style="width:75px;" onclick="changeInput('width',1);"><br> ! <input type="button" value="Decrease" style="width:75px;" onclick="changeInput('width',-1);"> </td> <td> ! <input type="button" value="Nudge" style="width:100px;" onclick="changeInput('down',1);"><br> ! <input type="button" value="Shift" style="width:100px;" onclick="changeInput('down',10);"><br> ! <input type="button" value="Align" style="width:100px;" onclick="alignInput('bottom');"><br> ! <span>DOWN</span> </td> <td style="background-color:#dddddd;"> ! <span>HEIGHT</span><br> ! <input type="button" value="Increase" style="width:75px;" onclick="changeInput('height',1);"><br> ! <input type="button" value="Decrease" style="width:75px;" onclick="changeInput('height',-1);"> </td> </tr> --- 2775,2801 ---- </td> <td> ! <span><bean:message key="eFormGenerator.tuningRight"/></span><br> ! <input type="button" value='<bean:message key="eFormGenerator.tuningNudgeButton"/>' style="width:50px;" onclick="changeInput('right',1);"> ! <input type="button" value='<bean:message key="eFormGenerator.tuningShiftButton"/>' style="width:50px;" onclick="changeInput('right',10);"> ! <input type="button" value='<bean:message key="eFormGenerator.tuningAlignButton"/>' style="width:50px;" onclick="alignInput('right');"> </td> </tr> <tr> <td style="background-color:#dddddd;"> ! <span><bean:message key="eFormGenerator.tuningWidth"/></span><br> ! <input type="button" value='<bean:message key="eFormGenerator.tuningIncreaseButton"/>' style="width:75px;" onclick="changeInput('width',1);"><br> ! <input type="button" value='<bean:message key="eFormGenerator.tuningDecreaseButton"/>' style="width:75px;" onclick="changeInput('width',-1);"> </td> <td> ! <input type="button" value='<bean:message key="eFormGenerator.tuningNudgeButton"/>' style="width:100px;" onclick="changeInput('down',1);"><br> ! <input type="button" value='<bean:message key="eFormGenerator.tuningShiftButton"/>' style="width:100px;" onclick="changeInput('down',10);"><br> ! <input type="button" value='<bean:message key="eFormGenerator.tuningAlignButton"/>' style="width:100px;" onclick="alignInput('bottom');"><br> ! <span><bean:message key="eFormGenerator.tuningDown"/></span> </td> <td style="background-color:#dddddd;"> ! <span><bean:message key="eFormGenerator.tuningHeight"/></span><br> ! <input type="button" value='<bean:message key="eFormGenerator.tuningIncreaseButton"/>' style="width:75px;" onclick="changeInput('height',1);"><br> ! <input type="button" value='<bean:message key="eFormGenerator.tuningDecreaseButton"/>' style="width:75px;" onclick="changeInput('height',-1);"> </td> </tr> *************** *** 2799,2826 **** </div> <hr> ! <span class='h2'>7. Miscellaneous Options</span><a onclick="show('Section7');">Expand</a>/<a onclick="hide('Section7');">Collapse</a> <div id="Section7"> ! <p><span class="h2">Maximize window when eForm loads.</span><br> ! <input name="maximizeWindow" id="maximizeWindow" type="checkbox">Useful for lower resolution monitors. </p> ! <p><span class='h2'>Emphasize Checkmarks:</span><br> ! <input name="DefaultCheckmark" id="DefaultCheckmark" type="checkbox">"Drawing" in checkmarks during printing. Works for Firefox older than 3.5, longer code, and may not work for IE.<br> ! <input name="ScaleCheckmark" id="ScaleCheckmark" type="checkbox">Scaling up checkbox. (Works for Firefox 3.5 or newer, Safari (or similar WebKit) 3.1 or newer, IE 5-7 or IE 8 running compatibility mode, Opera 10.5) </p> </div> <hr> ! <span class='h2'>8. Generate eForm</span><a onclick="show('Section8');">Expand</a>/<a onclick="hide('Section8');">Collapse</a> <div id='Section8'> <!-- Inject the html to the eForm window --> ! <input name="loadHTMLButton" id="loadHTMLButton" type="button" value="Load HTML code in new window" onClick="injectHtml();"> ! <input name="reset" id="reset" type="button" value="Reset form and start again" onclick="resetAll();"> <!-- Cookie Monster says hello! --> ! <input name="save" id="save" type="button" value="Save" onclick="save_to_cookie();"> ! <input name="restore" id="restore" type="button" value="Restore saved" onclick="restoreSaved();"> <!-- Cookie Monster says bye! --> ! <p>- The html code should open up in Edit E-Form window. ! <br>- Now you need to fill the fields shown (<i><b>form name,Additional Information,etc</b></i>): ! <br>- Save the form by clicking <i><b>Save</b></i> button ! <br>- DONE!! </p> --- 2804,2831 ---- </div> <hr> ! <span class='h2'>7. <bean:message key="eFormGenerator.misc"/></span><a onclick="show('Section7');"><bean:message key="eFormGenerator.expand"/></a>/<a onclick="hide('Section7');"><bean:message key="eFormGenerator.collapse"/></a> <div id="Section7"> ! <p><span class="h2"><bean:message key="eFormGenerator.miscMax"/></span><br> ! <input name="maximizeWindow" id="maximizeWindow" type="checkbox"><bean:message key="eFormGenerator.miscMaxhint"/> </p> ! <p><span class='h2'><bean:message key="eFormGenerator.miscCheckmarks"/></span><br> ! <input name="ScaleCheckmark" id="ScaleCheckmark" type="checkbox"><bean:message key="eFormGenerator.miscCheckmarksScale"/><br> ! <input name="DefaultCheckmark" id="DefaultCheckmark" type="checkbox"><bean:message key="eFormGenerator.miscCheckmarksDraw"/> </p> </div> <hr> ! <span class='h2'>8. <bean:message key="eFormGenerator.generate"/></span><a onclick="show('Section8');"><bean:message key="eFormGenerator.expand"/></a>/<a onclick="hide('Section8');"><bean:message key="eFormGenerator.collapse"/></a> <div id='Section8'> <!-- Inject the html to the eForm window --> ! <input name="loadHTMLButton" id="loadHTMLButton" type="button" value='<bean:message key="eFormGenerator.generateLoadButton"/>' onClick="injectHtml();"> ! <input name="reset" id="reset" type="button" value='<bean:message key="eFormGenerator.generateResetButton"/>' onclick="resetAll();"> <!-- Cookie Monster says hello! --> ! <input name="save" id="save" type="button" value='<bean:message key="eFormGenerator.generateSaveButton"/>' onclick="save_to_cookie();"> ! <input name="restore" id="restore" type="button" value='<bean:message key="eFormGenerator.generateRestoreSaveButton"/>' onclick="restoreSaved();"> <!-- Cookie Monster says bye! --> ! <p>- <bean:message key="eFormGenerator.generatehint1"/> ! <br>- <bean:message key="eFormGenerator.generatehint2"/> ! <br>- <bean:message key="eFormGenerator.generatehint3"/> ! <br>- <bean:message key="eFormGenerator.generatehint4"/> </p> |
|
From: Peter HC <pet...@us...> - 2010-11-08 22:28:45
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27093 Modified Files: oscarResources_en.properties Log Message: three more eFormGenerator tags Index: oscarResources_en.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v retrieving revision 1.352 retrieving revision 1.353 diff -C2 -d -r1.352 -r1.353 *** oscarResources_en.properties 6 Nov 2010 17:35:42 -0000 1.352 --- oscarResources_en.properties 8 Nov 2010 22:28:37 -0000 1.353 *************** *** 2630,2634 **** oscarEncounter.formRourke2009_4.formupDownStairs=Walks up/down stairs alternating feet oscarEncounter.formRourke2009_4.formundoesZippers=Undoes buttons and zippers ! oscarEncounter.formRourke2009_4.form2Directions=Understands 2 and 3 step directions (eg. \u201cPick up your hat and shoes and put them in the closet.\u201d) oscarEncounter.formRourke2009_4.form5ormoreWords= Uses sentences with 5 or more words oscarEncounter.formRourke2009_4.formwalksUpStairs=Walks up stairs using handrail --- 2630,2634 ---- oscarEncounter.formRourke2009_4.formupDownStairs=Walks up/down stairs alternating feet oscarEncounter.formRourke2009_4.formundoesZippers=Undoes buttons and zippers ! oscarEncounter.formRourke2009_4.form2Directions=Understands 2 and 3 step directions (eg. \u201CPick up your hat and shoes and put them in the closet.\u201D) oscarEncounter.formRourke2009_4.form5ormoreWords= Uses sentences with 5 or more words oscarEncounter.formRourke2009_4.formwalksUpStairs=Walks up stairs using handrail *************** *** 4561,4565 **** pager.header.title=Resultado: pager.max.page.index=10 ! pager.next.desc=Pr\u00f3ximo pager.prev.desc=Anterior --- 4561,4565 ---- pager.header.title=Resultado: pager.max.page.index=10 ! pager.next.desc=Pr\u00F3ximo pager.prev.desc=Anterior *************** *** 5636,5639 **** --- 5636,5642 ---- eFormGenerator.inputFormatStyleItalic=italic eFormGenerator.inputFormatWeight=Font Weight + eFormGenerator.inputFormatWeightBold=bold + eFormGenerator.inputFormatWeightBolder=bolder + eFormGenerator.inputFormatWeightLighter=lighter eFormGenerator.inputFormatSize=Font Size eFormGenerator.inputFormatSizehint=(in px, usually 12-14) |
|
From: jai <yg...@us...> - 2010-11-08 22:08:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21981 Modified Files: documentsInQueues.jsp Log Message: - ID: 3105571 -hashtable to hashmap Index: documentsInQueues.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS/documentsInQueues.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** documentsInQueues.jsp 6 Nov 2010 17:33:41 -0000 1.1 --- documentsInQueues.jsp 8 Nov 2010 22:08:10 -0000 1.2 *************** *** 54,68 **** <body> <% ! Hashtable queueIdNames=(Hashtable)request.getAttribute("queueIdNames");//each queue id has a corresponding name ! Hashtable queueDocNos=(Hashtable)request.getAttribute("queueDocNos");//one queue id is linked to a list of docs String providerNo=(String)request.getAttribute("providerNo"); String searchProviderNo=(String)request.getAttribute("searchProviderNo"); ! Enumeration keys=queueDocNos.keys(); String patientIdNamesStr=(String)request.getAttribute("patientIdNamesStr"); ! Hashtable docStatus=(Hashtable)request.getAttribute("docStatus"); String patientIdStr =(String)request.getAttribute("patientIdStr"); ! Hashtable typeDocLab =(Hashtable)request.getAttribute("typeDocLab"); ! Hashtable docType=(Hashtable)request.getAttribute("docType"); ! Hashtable patientDocs=(Hashtable)request.getAttribute("patientDocs"); List<String> normals=(List<String>)request.getAttribute("normals"); List<String> abnormals=(List<String>)request.getAttribute("abnormals"); --- 54,69 ---- <body> <% ! HashMap queueIdNames=(HashMap)request.getAttribute("queueIdNames");//each queue id has a corresponding name ! HashMap queueDocNos=(HashMap)request.getAttribute("queueDocNos");//one queue id is linked to a list of docs String providerNo=(String)request.getAttribute("providerNo"); String searchProviderNo=(String)request.getAttribute("searchProviderNo"); ! Set keys=queueDocNos.keySet(); ! Iterator itr=keys.iterator(); String patientIdNamesStr=(String)request.getAttribute("patientIdNamesStr"); ! HashMap docStatus=(HashMap)request.getAttribute("docStatus"); String patientIdStr =(String)request.getAttribute("patientIdStr"); ! HashMap typeDocLab =(HashMap)request.getAttribute("typeDocLab"); ! HashMap docType=(HashMap)request.getAttribute("docType"); ! HashMap patientDocs=(HashMap)request.getAttribute("patientDocs"); List<String> normals=(List<String>)request.getAttribute("normals"); List<String> abnormals=(List<String>)request.getAttribute("abnormals"); *************** *** 106,114 **** <td valign="top" id="queueNames" width="20%"> <% ! while(keys.hasMoreElements()){ ! Integer qId=(Integer)keys.nextElement(); String name=(String)queueIdNames.get(qId); ! List dos=(List)queueDocNos.get(qId); ! Integer numberOfDocs=dos.size(); %> <a href="javascript:void(0);" onclick="resetCurrentFirstDocLab();showDocInQueue('<%=qId%>')"><%=name%> (<span id="docNo_<%=qId%>"><%=numberOfDocs%></span>)</a><br/> --- 107,115 ---- <td valign="top" id="queueNames" width="20%"> <% ! while(itr.hasNext()){ ! Integer qId=(Integer)itr.next(); String name=(String)queueIdNames.get(qId); ! List dos=(List)queueDocNos.get(qId); ! Integer numberOfDocs=dos.size(); %> <a href="javascript:void(0);" onclick="resetCurrentFirstDocLab();showDocInQueue('<%=qId%>')"><%=name%> (<span id="docNo_<%=qId%>"><%=numberOfDocs%></span>)</a><br/> |
|
From: jai <yg...@us...> - 2010-11-08 22:07:30
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/actions In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21855 Modified Files: DmsInboxManageAction.java Log Message: - ID: 3105571 -change string buffer to string builder,hashtable to hashmap Index: DmsInboxManageAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/actions/DmsInboxManageAction.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** DmsInboxManageAction.java 6 Nov 2010 17:37:14 -0000 1.12 --- DmsInboxManageAction.java 8 Nov 2010 22:07:22 -0000 1.13 *************** *** 647,653 **** String patientIdNamesStr=""; List<QueueDocumentLink> qs=queueDocumentLinkDAO.getActiveQueueDocLink(); ! Hashtable queueDocNos=new Hashtable(); ! Hashtable docType=new Hashtable(); ! Hashtable<Integer,List> patientDocs=new Hashtable(); DocumentDAO documentDAO=(DocumentDAO) SpringUtils.getBean("documentDAO"); Demographic demo =new Demographic(); --- 647,653 ---- String patientIdNamesStr=""; List<QueueDocumentLink> qs=queueDocumentLinkDAO.getActiveQueueDocLink(); ! HashMap queueDocNos=new HashMap(); ! HashMap docType=new HashMap(); ! HashMap<Integer,List> patientDocs=new HashMap(); DocumentDAO documentDAO=(DocumentDAO) SpringUtils.getBean("documentDAO"); Demographic demo =new Demographic(); *************** *** 656,663 **** List<Integer> patientIds=new ArrayList(); Integer demoNo; ! Hashtable docStatus=new Hashtable(); String patientIdStr=""; ! StringBuffer patientIdBuf=new StringBuffer(); ! Hashtable typeDocLab=new Hashtable(); List ListDocIds=new ArrayList(); for(QueueDocumentLink q:qs){ --- 656,663 ---- List<Integer> patientIds=new ArrayList(); Integer demoNo; ! HashMap docStatus=new HashMap(); String patientIdStr=""; ! StringBuilder patientIdBud=new StringBuilder(); ! HashMap typeDocLab=new HashMap(); List ListDocIds=new ArrayList(); for(QueueDocumentLink q:qs){ *************** *** 714,722 **** for(int i=0;i<patientIds.size();i++){ dn=patientIds.get(i); ! patientIdBuf.append(dn); if(i!=patientIds.size()-1) ! patientIdBuf.append(","); } ! patientIdStr=patientIdBuf.toString(); typeDocLab.put("DOC", ListDocIds); List normals=ListDocIds;//assume all documents are normal --- 714,722 ---- for(int i=0;i<patientIds.size();i++){ dn=patientIds.get(i); ! patientIdBud.append(dn); if(i!=patientIds.size()-1) ! patientIdBud.append(","); } ! patientIdStr=patientIdBud.toString(); typeDocLab.put("DOC", ListDocIds); List normals=ListDocIds;//assume all documents are normal *************** *** 733,737 **** request.setAttribute("queueDocNos", queueDocNos); request.setAttribute("patientIdNamesStr",patientIdNamesStr); ! request.setAttribute("queueIdNames", queueDAO.getQueuesHashtable()); request.setAttribute("providerNo", providerNo); request.setAttribute("searchProviderNo", searchProviderNo); --- 733,737 ---- request.setAttribute("queueDocNos", queueDocNos); request.setAttribute("patientIdNamesStr",patientIdNamesStr); ! request.setAttribute("queueIdNames", queueDAO.getQueuesHashMap()); request.setAttribute("providerNo", providerNo); request.setAttribute("searchProviderNo", searchProviderNo); |
|
From: Toby B. <tob...@us...> - 2010-11-08 20:14:08
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27788/WEB-INF/classes/src/org/oscarehr/common/web Modified Files: DxresearchReportAction.java Log Message: add more appointment status icons / icd9 report give total number Index: DxresearchReportAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/web/DxresearchReportAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DxresearchReportAction.java 3 Nov 2010 03:17:10 -0000 1.6 --- DxresearchReportAction.java 8 Nov 2010 20:13:58 -0000 1.7 *************** *** 73,76 **** --- 73,81 ---- List patientInfo = dxresearchdao.patientRegistedAll(codeSearch,providerNoList); request.getSession().setAttribute("listview", patientInfo); + if (patientInfo == null || patientInfo.size()==0) + { + request.getSession().setAttribute("Counter", 0); + }else + request.getSession().setAttribute("Counter", patientInfo.size()); request.getSession().setAttribute("radiovaluestatus", "patientRegistedAll"); return mapping.findForward(SUCCESS); *************** *** 92,95 **** --- 97,105 ---- List patientInfo = dxresearchdao.patientRegistedDistincted(codeSearch,providerNoList); request.getSession().setAttribute("listview", patientInfo); + if (patientInfo == null || patientInfo.size()==0) + { + request.getSession().setAttribute("Counter", 0); + }else + request.getSession().setAttribute("Counter", patientInfo.size()); request.getSession().setAttribute("radiovaluestatus", "patientRegistedDistincted"); return mapping.findForward(SUCCESS); *************** *** 111,114 **** --- 121,129 ---- List patientInfo = dxresearchdao.patientRegistedDeleted(codeSearch,providerNoList); request.getSession().setAttribute("listview", patientInfo); + if (patientInfo == null || patientInfo.size()==0) + { + request.getSession().setAttribute("Counter", 0); + }else + request.getSession().setAttribute("Counter", patientInfo.size()); request.getSession().setAttribute("radiovaluestatus", "patientRegistedDeleted"); return mapping.findForward(SUCCESS); *************** *** 130,133 **** --- 145,153 ---- List patientInfo = dxresearchdao.patientRegistedActive(codeSearch,providerNoList); request.getSession().setAttribute("listview", patientInfo); + if (patientInfo == null || patientInfo.size()==0) + { + request.getSession().setAttribute("Counter", 0); + }else + request.getSession().setAttribute("Counter", patientInfo.size()); request.getSession().setAttribute("radiovaluestatus", "patientRegistedActive"); return mapping.findForward(SUCCESS); *************** *** 149,152 **** --- 169,177 ---- List patientInfo = dxresearchdao.patientRegistedResolve(codeSearch,providerNoList); request.getSession().setAttribute("listview", patientInfo); + if (patientInfo == null || patientInfo.size()==0) + { + request.getSession().setAttribute("Counter", 0); + }else + request.getSession().setAttribute("Counter", patientInfo.size()); request.getSession().setAttribute("radiovaluestatus", "patientRegistedResolve"); return mapping.findForward(SUCCESS); |
|
From: Toby B. <tob...@us...> - 2010-11-08 20:14:07
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/META-INF In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27788/META-INF Added Files: context.xml Log Message: add more appointment status icons / icd9 report give total number --- NEW FILE: context.xml --- <?xml version="1.0" encoding="UTF-8"?> <Context antiJARLocking="true" path="/oscar_head"/> |
|
From: Toby B. <tob...@us...> - 2010-11-08 20:14:07
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/images In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27788/images Added Files: S6.gif S7.gif S11.gif S10.gif 8.gif V10.gif 11.gif V9.gif V11.gif 7.gif S9.gif V6_1.gif 9.gif V8.gif V7.gif S8.gif 10.gif Log Message: add more appointment status icons / icd9 report give total number --- NEW FILE: 8.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: S11.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: V11.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: S6.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: S9.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: V6_1.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: V10.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: 9.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: 7.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: S10.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: V8.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: V9.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: S7.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: S8.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: 11.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: 10.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: V7.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Toby B. <tob...@us...> - 2010-11-08 20:14:07
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarReport In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27788/oscarReport Modified Files: oscarReportDxReg.jsp Log Message: add more appointment status icons / icd9 report give total number Index: oscarReportDxReg.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarReport/oscarReportDxReg.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** oscarReportDxReg.jsp 4 Nov 2010 05:26:23 -0000 1.9 --- oscarReportDxReg.jsp 8 Nov 2010 20:13:58 -0000 1.10 *************** *** 207,211 **** </tbody> </table> ! Filter: <label> --- 207,217 ---- </tbody> </table> ! <table border="0"> ! <thead> ! <tr> ! <th>Total Number(s): <%= (Integer) session.getAttribute("Counter")%></th> ! </tr> ! </thead> ! </table> Filter: <label> |
|
From: Ronnie C. <cr...@us...> - 2010-11-08 20:03:34
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi/updates In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv25447 Modified Files: Tag: RELEASE_10_06 patch-2010-06-01-only-for-oscar.sql Log Message: removed 5 lines which insert duplicate entries Index: patch-2010-06-01-only-for-oscar.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi/updates/patch-2010-06-01-only-for-oscar.sql,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** patch-2010-06-01-only-for-oscar.sql 5 Nov 2010 21:25:06 -0000 1.1.2.2 --- patch-2010-06-01-only-for-oscar.sql 8 Nov 2010 20:03:26 -0000 1.1.2.3 *************** *** 14,18 **** insert into `secRole` (role_name, description) values('Support Worker', 'Support Worker'); insert into `secRole` (role_name, description) values('Client Service Worker', 'Client Service Worker'); - insert into `secRole` (role_name, description) values('Recreation Therapist', 'Recreation Therapist'); insert into access_type (name, type) values("read ticklers assigned to a doctor","access"); --- 14,17 ---- *************** *** 96,101 **** insert into access_type (name, type) values("read Client Service Worker notes","access"); - insert into access_type (name, type) values("read ticklers assigned to a Recreation Therapist","access"); - insert into access_type (name, type) values("write Recreation Therapist issues","access"); - insert into access_type (name, type) values("read Recreation Therapist issues","access"); - insert into access_type (name, type) values("read Recreation Therapist notes","access"); --- 95,96 ---- |
|
From: Ronnie C. <cr...@us...> - 2010-11-08 20:01:43
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi/updates In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv25213 Modified Files: patch-2010-06-01-only-for-oscar.sql Log Message: removed 5 lines which insert duplicate entries Index: patch-2010-06-01-only-for-oscar.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi/updates/patch-2010-06-01-only-for-oscar.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** patch-2010-06-01-only-for-oscar.sql 5 Nov 2010 21:13:14 -0000 1.1 --- patch-2010-06-01-only-for-oscar.sql 8 Nov 2010 20:01:35 -0000 1.2 *************** *** 14,18 **** insert into `secRole` (role_name, description) values('Support Worker', 'Support Worker'); insert into `secRole` (role_name, description) values('Client Service Worker', 'Client Service Worker'); - insert into `secRole` (role_name, description) values('Recreation Therapist', 'Recreation Therapist'); insert into access_type (name, type) values("read ticklers assigned to a doctor","access"); --- 14,17 ---- *************** *** 96,101 **** insert into access_type (name, type) values("read Client Service Worker notes","access"); - insert into access_type (name, type) values("read ticklers assigned to a Recreation Therapist","access"); - insert into access_type (name, type) values("write Recreation Therapist issues","access"); - insert into access_type (name, type) values("read Recreation Therapist issues","access"); - insert into access_type (name, type) values("read Recreation Therapist notes","access"); --- 95,96 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-08 06:24:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv4767/docs Modified Files: gerrit_working_model.txt Log Message: added server maintenance section for gerrit Index: gerrit_working_model.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/gerrit_working_model.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** gerrit_working_model.txt 7 Nov 2010 13:05:52 -0000 1.8 --- gerrit_working_model.txt 8 Nov 2010 06:24:12 -0000 1.9 *************** *** 1,3 **** ! This document out lines how we'll user gerrit in our work flow. ------- --- 1,3 ---- ! This document out lines how we'll use gerrit. ------- *************** *** 63,71 **** - now you'll want to clone the project in your favourite git tool, and commit & push all the previous files / existing code that's being ported. - ---------------- - Review Work Flow - ---------------- - Reviewer logins in, select one of the branches, click review, if it's good set verified=+1, review=+2, then click publish and submit, and it's into the main branch. - ----------- --- 63,66 ---- *************** *** 81,82 **** --- 76,94 ---- [remote "sourceforget"] url = ssh://osc...@os...:/oscarmcmaster/{name}/ + ** not finished here yet + + + ---------------- + Review Work Flow + ---------------- + Reviewer logins in, select one of the branches, click review, if it's good set verified=+1, review=+2, then click publish and submit, and it's into the main branch. + + ------------------ + Server maintenance + ------------------ + The data on this machine is not critical. All repository data on this machine is replicated to sourceforge, and is also available on developers machines who have pulled from this machine. + + Having said that, I think we should still back up this machine. The above steps should help us reconfigure the machine if necessary, but reconfiguring and reregistering all the users and setting up everyones ssh keys etc would be a pain. + + Because of the above, we could live with an infrequent backup, i.e. once a week. If the server fails, we can restore it from a week old backup, then restore the git repository from sourceforge. The only things we'd lose then is any new user registrations in the last week. + |
|
From: Marc D. <hex...@us...> - 2010-11-08 02:50:06
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18225/database/mysql/updates Added Files: update-2010-11-05.sql Log Message: missing tables for eyeform --- NEW FILE: update-2010-11-05.sql --- -- -- Table structure for table `eyeform_followup` -- DROP TABLE IF EXISTS `eyeform_followup`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `eyeform_followup` ( `id` int(11) NOT NULL AUTO_INCREMENT, `appointment_no` int(11) DEFAULT NULL, `demographic_no` int(11) DEFAULT NULL, `timespan` int(11) DEFAULT NULL, `timeframe` varchar(25) DEFAULT NULL, `followup_provider` varchar(100) DEFAULT NULL, `date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) ) ENGINE=MyISAM AUTO_INCREMENT=6 DEFAULT CHARSET=latin1; /*!40101 SET character_set_client = @saved_cs_client */; -- -- Table structure for table `eyeform_macro` -- DROP TABLE IF EXISTS `eyeform_macro`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `eyeform_macro` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `label` varchar(255) COLLATE utf8_bin NOT NULL, `display_order` tinyint(4) NOT NULL, `impression` text COLLATE utf8_bin, `followup_no` smallint(5) DEFAULT NULL, `followup_unit` varchar(50) COLLATE utf8_bin DEFAULT NULL, `followup_doctor` varchar(6) COLLATE utf8_bin DEFAULT NULL, `followup_reason` varchar(255) COLLATE utf8_bin DEFAULT NULL, `tickler_staff` varchar(6) COLLATE utf8_bin DEFAULT NULL, `billing_visit_type` varchar(50) COLLATE utf8_bin DEFAULT NULL, `billing_visit_location` varchar(50) COLLATE utf8_bin DEFAULT NULL, `billing_codes` text COLLATE utf8_bin, `billing_dxcode` varchar(50) COLLATE utf8_bin DEFAULT NULL, `billing_total` varchar(50) COLLATE utf8_bin DEFAULT NULL, `billing_comment` varchar(255) COLLATE utf8_bin DEFAULT NULL, `billing_billtype` varchar(50) COLLATE utf8_bin DEFAULT NULL, `billing_pay_method` varchar(50) COLLATE utf8_bin DEFAULT NULL, `billing_billto` varchar(50) COLLATE utf8_bin DEFAULT NULL, `billing_remitto` varchar(50) COLLATE utf8_bin DEFAULT NULL, `billing_gstBilledTotal` varchar(50) COLLATE utf8_bin DEFAULT NULL, `billing_payment` varchar(50) COLLATE utf8_bin DEFAULT NULL, `billing_refund` varchar(50) COLLATE utf8_bin DEFAULT NULL, `billing_gst` varchar(50) COLLATE utf8_bin DEFAULT NULL, `test_records` text COLLATE utf8_bin, PRIMARY KEY (`id`) ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; /*!40101 SET character_set_client = @saved_cs_client */; -- -- Table structure for table `ocularprocedurehis` -- DROP TABLE IF EXISTS `ocularprocedurehis`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `ocularprocedurehis` ( `id` int(11) NOT NULL AUTO_INCREMENT, `demographic_no` int(11) NOT NULL DEFAULT '0', `provider` varchar(60) DEFAULT NULL, `date` date NOT NULL DEFAULT '0000-00-00', `eye` varchar(2) NOT NULL DEFAULT '', `procedure_name` varchar(100) NOT NULL DEFAULT '', `procedure_type` varchar(30) DEFAULT NULL, `procedure_note` text, `doctor` varchar(30) DEFAULT NULL, `location` varchar(30) DEFAULT NULL, `update_time` datetime DEFAULT NULL, `status` varchar(2) DEFAULT 'A', `appointment_no` int(11) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- -- Table structure for table `procedurebook` -- DROP TABLE IF EXISTS `procedurebook`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `procedurebook` ( `id` int(11) NOT NULL AUTO_INCREMENT, `eyeform_id` bigint(20) DEFAULT NULL, `demographic_no` int(11) DEFAULT NULL, `appointment_no` int(11) DEFAULT NULL, `provider` varchar(60) DEFAULT NULL, `procedure_name` varchar(30) DEFAULT NULL, `eye` varchar(20) DEFAULT NULL, `location` varchar(50) DEFAULT NULL, `urgency` varchar(10) DEFAULT NULL, `comment` text, `date` datetime DEFAULT NULL, `status` varchar(2) DEFAULT 'A', PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- -- Table structure for table `specshis` -- DROP TABLE IF EXISTS `specshis`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `specshis` ( `id` int(11) NOT NULL AUTO_INCREMENT, `demographic_no` int(11) NOT NULL DEFAULT '0', `provider` varchar(60) DEFAULT NULL, `date` date DEFAULT NULL, `doctor` varchar(30) DEFAULT NULL, `type` varchar(30) DEFAULT NULL, `od_sph` varchar(10) DEFAULT NULL, `od_cyl` varchar(10) DEFAULT NULL, `od_axis` varchar(10) DEFAULT NULL, `od_add` varchar(10) DEFAULT NULL, `od_prism` varchar(10) DEFAULT NULL, `os_sph` varchar(10) DEFAULT NULL, `os_cyl` varchar(10) DEFAULT NULL, `os_axis` varchar(10) DEFAULT NULL, `os_add` varchar(10) DEFAULT NULL, `os_prism` varchar(10) DEFAULT NULL, `update_time` datetime DEFAULT NULL, `status` varchar(2) DEFAULT 'A', `appointment_no` int(11) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- -- Table structure for table `testbookrecord` -- DROP TABLE IF EXISTS `testbookrecord`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `testbookrecord` ( `id` int(11) NOT NULL AUTO_INCREMENT, `testname` varchar(60) DEFAULT NULL, `appointment_no` int(11) DEFAULT NULL, `demographic_no` int(11) DEFAULT NULL, `provider` varchar(60) DEFAULT NULL, `eyeform_id` bigint(20) DEFAULT NULL, `eye` varchar(20) DEFAULT NULL, `urgency` varchar(30) DEFAULT NULL, `comment` varchar(100) DEFAULT NULL, `date` datetime DEFAULT NULL, `status` varchar(2) DEFAULT 'A', PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; |
|
From: Jay G. <jay...@us...> - 2010-11-07 23:06:13
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5094 Modified Files: Tag: RELEASE_9_12 adjustBill.jsp Log Message: ID: 3084486 -- Work on null pointer exception which keeps page from displaying in full. Index: adjustBill.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/adjustBill.jsp,v retrieving revision 1.48.4.3 retrieving revision 1.48.4.4 diff -C2 -d -r1.48.4.3 -r1.48.4.4 *** adjustBill.jsp 30 Apr 2010 20:20:20 -0000 1.48.4.3 --- adjustBill.jsp 7 Nov 2010 23:06:05 -0000 1.48.4.4 *************** *** 663,666 **** --- 663,670 ---- <% BillingService billService = bcd.getBillingCodeByCode(allFields.getProperty("billing_code"),billingmaster.getServiceDateAsDate()); + String billValue= "0.00"; + if(billService != null){ + billValue = billService.getValue(); + } %> <table width="100%" border=1> *************** *** 682,687 **** </td> <td width="50%" class="bCellData"> ! <%=billform.getServiceDesc(allFields.getProperty("billing_code"),billRegion)%> ($<span id="valueDisplay"><%=billService.getValue()%></span>) ! <input type="hidden" value="<%=billService.getValue()%>" id="billValue"/> <input type="button" value="Recalculate" onclick="calculateFee()"/> </td> --- 686,691 ---- </td> <td width="50%" class="bCellData"> ! <%=billform.getServiceDesc(allFields.getProperty("billing_code"),billRegion)%> ($<span id="valueDisplay"><%=billValue%></span>) ! <input type="hidden" value="<%=billValue%>" id="billValue"/> <input type="button" value="Recalculate" onclick="calculateFee()"/> </td> |
|
From: Ted L. <ted...@us...> - 2010-11-07 13:06:00
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5273/docs Modified Files: gerrit_working_model.txt Log Message: added info on gerrit replication Index: gerrit_working_model.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/gerrit_working_model.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** gerrit_working_model.txt 7 Nov 2010 12:00:44 -0000 1.7 --- gerrit_working_model.txt 7 Nov 2010 13:05:52 -0000 1.8 *************** *** 66,68 **** Review Work Flow ---------------- ! Reviewer logins in, select one of the branches, click review, if it's good set verified=+1, review=+2, then click publish and submit, and it's into the main branch. \ No newline at end of file --- 66,82 ---- Review Work Flow ---------------- ! Reviewer logins in, select one of the branches, click review, if it's good set verified=+1, review=+2, then click publish and submit, and it's into the main branch. ! ! ! ----------- ! Replication ! ----------- ! Original intent of this section is replication of gerrit to sourceforge, this should generally be the same for any other git repository though. ! - the SF server is oscarmcmaster.git.sourcegorge.net ! - ssh to the above server with the gerrit linux user so the known_hosts file is populated, you don't actually have to login. ! - generate an ssh key as per the "ssh-keygen -t rsa" command if you don't already have a key ! - register a user for gerrit with sourceforge, i.e. we're using ge...@os... for all the emails so we might as well register that user for replication. ! - need to add gerrit public key to sourceforge ! - add config file gerrit/review_site/replication.config with contents ! [remote "sourceforget"] ! url = ssh://osc...@os...:/oscarmcmaster/{name}/ |
|
From: Ted L. <ted...@us...> - 2010-11-07 12:00:53
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22616/docs Modified Files: gerrit_working_model.txt Log Message: updated docs so I remember to put the domain on the google smtp user Index: gerrit_working_model.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/gerrit_working_model.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gerrit_working_model.txt 5 Nov 2010 03:11:25 -0000 1.6 --- gerrit_working_model.txt 7 Nov 2010 12:00:44 -0000 1.7 *************** *** 33,37 **** - run "java -jar gerrit-2.1.5.war init -d review_site", from here on accept the defaults if not mentione here - at "Sql Database", enter "mysql" instead. ! - at "SMTP server hostname", enter either a mcmaster or google smtp server information, gmails's example maybe : smtp.gmail.com:465, ssl - use SSL for the http daemon. - for http daemon listen port put it back to 8080 (instead of 8443) --- 33,37 ---- - run "java -jar gerrit-2.1.5.war init -d review_site", from here on accept the defaults if not mentione here - at "Sql Database", enter "mysql" instead. ! - at "SMTP server hostname", enter either a mcmaster or google smtp server information, gmails's example maybe : smtp.gmail.com:465, ssl, ge...@os... - use SSL for the http daemon. - for http daemon listen port put it back to 8080 (instead of 8443) |
|
From: jai <yg...@us...> - 2010-11-06 19:39:32
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23038 Added Files: Tag: RELEASE_10_06 update-2010-11-06.sql Log Message: - ID: 3104263 -add status column --- NEW FILE: update-2010-11-06.sql --- alter table queue_document_link add status char(1); |
|
From: jai <yg...@us...> - 2010-11-06 19:39:06
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/actions In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22960 Modified Files: Tag: RELEASE_10_06 DmsInboxManageAction.java Log Message: - ID: 3104263 -add documents in queues -update status in queue link Index: DmsInboxManageAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/actions/DmsInboxManageAction.java,v retrieving revision 1.2.2.5 retrieving revision 1.2.2.6 diff -C2 -d -r1.2.2.5 -r1.2.2.6 *** DmsInboxManageAction.java 22 Oct 2010 22:19:27 -0000 1.2.2.5 --- DmsInboxManageAction.java 6 Nov 2010 19:38:58 -0000 1.2.2.6 *************** *** 63,66 **** --- 63,67 ---- import org.oscarehr.common.dao.QueueDao; import org.oscarehr.common.model.Demographic; + import org.oscarehr.document.dao.DocumentDAO; import org.oscarehr.util.MiscUtils; import oscar.dms.EDocUtil; *************** *** 80,83 **** --- 81,85 ---- private SecObjectNameDao secObjectNameDao=null; private SecUserRoleDao secUserRoleDao = (SecUserRoleDao) SpringUtils.getBean("secUserRoleDao"); + private QueueDao queueDAO=(QueueDao)SpringUtils.getBean("queueDao"); public void setProviderInboxRoutingDAO(ProviderInboxRoutingDao providerInboxRoutingDAO){ this.providerInboxRoutingDAO = providerInboxRoutingDAO; *************** *** 156,160 **** queueDocs.put(queueId, EDocs); } ! System.out.println("queueDocs="+queueDocs); for(int i=0;i<privatedocs.size();i++){ EDoc eDoc=privatedocs.get(i); --- 158,162 ---- queueDocs.put(queueId, EDocs); } ! MiscUtils.getLogger().debug("queueDocs="+queueDocs); for(int i=0;i<privatedocs.size();i++){ EDoc eDoc=privatedocs.get(i); *************** *** 170,179 **** Integer qidInt=qdl.getQueueId(); String qidStr=qidInt.toString(); ! System.out.println("qid in link="+qidStr); if(queueDocs.containsKey(qidStr)){ List<EDoc> EDocs=new ArrayList(); EDocs=(List<EDoc>)queueDocs.get(qidStr); EDocs.add(eDoc); ! System.out.println("add edoc id to queue id="+eDoc.getDocId()); queueDocs.put(qidStr, EDocs); } --- 172,181 ---- Integer qidInt=qdl.getQueueId(); String qidStr=qidInt.toString(); ! MiscUtils.getLogger().debug("qid in link="+qidStr); if(queueDocs.containsKey(qidStr)){ List<EDoc> EDocs=new ArrayList(); EDocs=(List<EDoc>)queueDocs.get(qidStr); EDocs.add(eDoc); ! MiscUtils.getLogger().debug("add edoc id to queue id="+eDoc.getDocId()); queueDocs.put(qidStr, EDocs); } *************** *** 189,192 **** --- 191,195 ---- if(eDocs==null || eDocs.size()==0){ queueDocs.remove(queueId); + MiscUtils.getLogger().debug("removed queueId="+queueId); } } *************** *** 274,282 **** public ActionForward prepareForIndexPage(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { HttpSession session=request.getSession(); try{if(session.getAttribute("userrole") == null ) response.sendRedirect("../logout.jsp");} ! catch(Exception e){e.printStackTrace();} //oscar.oscarMDS.data.MDSResultsData mDSData = new oscar.oscarMDS.data.MDSResultsData(); --- 277,287 ---- + public ActionForward prepareForIndexPage(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { HttpSession session=request.getSession(); try{if(session.getAttribute("userrole") == null ) response.sendRedirect("../logout.jsp");} ! catch(Exception e){MiscUtils.getLogger().error("Error", e);} + //can't use userrole from session, because it changes if provider A search for provider B's documents //oscar.oscarMDS.data.MDSResultsData mDSData = new oscar.oscarMDS.data.MDSResultsData(); *************** *** 441,444 **** --- 446,450 ---- for(int i=0;i<labdocs.size();i++){ LabResultData data=(LabResultData)labdocs.get(i); + List<String> segIDs=new ArrayList(); String labPatientId=data.getLabPatientId(); *************** *** 474,478 **** patientDocs.put(labPatientId, segIDs); patientIdNames.put(labPatientId, data.patientName); ! patientIdNamesStr+=';'+labPatientId+'='+data.patientName; } docStatus.put(data.getSegmentID(), data.getAcknowledgedStatus()); --- 480,484 ---- patientDocs.put(labPatientId, segIDs); patientIdNames.put(labPatientId, data.patientName); ! patientIdNamesStr+=";"+labPatientId+"="+data.patientName; } docStatus.put(data.getSegmentID(), data.getAcknowledgedStatus()); *************** *** 546,557 **** request.setAttribute("demographicNo", demographicNo); request.setAttribute("ackStatus",ackStatus ); - - System.out.print("start"); - for(int i=0;i<labdocs.size();i++){ - LabResultData data=(LabResultData)labdocs.get(i); - System.out.print("--"+data.segmentID); - } - System.out.println(); - System.out.println("end"); request.setAttribute("labdocs", labdocs); request.setAttribute("patientNumDoc", patientNumDoc); --- 552,555 ---- *************** *** 577,581 **** } }catch(Exception e){ ! e.printStackTrace(); } --- 575,579 ---- } }catch(Exception e){ ! MiscUtils.getLogger().error("Error", e); } *************** *** 586,590 **** response.getOutputStream().write(jsonObject.toString().getBytes()); }catch(java.io.IOException ioe){ ! ioe.printStackTrace(); } return null; --- 584,588 ---- response.getOutputStream().write(jsonObject.toString().getBytes()); }catch(java.io.IOException ioe){ ! MiscUtils.getLogger().error("Error", ioe); } return null; *************** *** 621,623 **** --- 619,742 ---- } + + public ActionForward updateDocStatusInQueue(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response){ + String docid=request.getParameter("docid"); + if(docid!=null){ + if(!queueDocumentLinkDAO.setStatusInactive(Integer.parseInt(docid))){ + MiscUtils.getLogger().error("failed to set status in queue document link to be inactive"); + } + } + return null; + } + + //return a hastable containing queue id to queue name, a hashtable of queue id and a list of document nos. + //forward to documentInQueus.jsp + public ActionForward getDocumentsInQueues(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response){ + HttpSession session=request.getSession(); + try{if(session.getAttribute("userrole") == null ) response.sendRedirect("../logout.jsp");} + catch(Exception e){MiscUtils.getLogger().error("Error", e);} + String providerNo = (String) session.getAttribute("user"); + String searchProviderNo = request.getParameter("searchProviderNo"); + String ackStatus = request.getParameter("status"); + + + if ( ackStatus == null ) { ackStatus = "N"; } // default to new labs only + if ( providerNo == null ) { providerNo = ""; } + if ( searchProviderNo == null ) { searchProviderNo = providerNo; } + + String patientIdNamesStr=""; + List<QueueDocumentLink> qs=queueDocumentLinkDAO.getActiveQueueDocLink(); + Hashtable queueDocNos=new Hashtable(); + Hashtable docType=new Hashtable(); + Hashtable<Integer,List> patientDocs=new Hashtable(); + DocumentDAO documentDAO=(DocumentDAO) SpringUtils.getBean("documentDAO"); + Demographic demo =new Demographic(); + List docsWithPatient=new ArrayList(); + Hashtable patientIdNames=new Hashtable();//lbData.patientName = demo.getLastName()+ ", "+demo.getFirstName(); + List<Integer> patientIds=new ArrayList(); + Integer demoNo; + Hashtable docStatus=new Hashtable(); + String patientIdStr=""; + StringBuffer patientIdBuf=new StringBuffer(); + Hashtable typeDocLab=new Hashtable(); + List ListDocIds=new ArrayList(); + for(QueueDocumentLink q:qs){ + int qid=q.getQueueId(); + int docid=q.getDocId(); + ListDocIds.add(docid); + docType.put(docid,"DOC"); + demo=documentDAO.getDemoFromDocNo(Integer.toString(docid)); + if(demo==null) + demoNo=-1; + else + demoNo=demo.getDemographicNo(); + if(!patientIds.contains(demoNo)) + patientIds.add(demoNo); + if(!patientIdNames.containsKey(demoNo)){ + if(demoNo==-1){ + patientIdNames.put(demoNo,"Not, Assigned"); + patientIdNamesStr+=";"+demoNo+"="+"Not, Assigned"; + } + else{ + patientIdNames.put(demoNo, demo.getLastName()+", "+demo.getFirstName()); + patientIdNamesStr+=";"+demoNo+"="+demo.getLastName()+", "+demo.getFirstName(); + } + + + } + List providers=providerInboxRoutingDAO.getProvidersWithRoutingForDocument("DOC",Integer.toString(docid) ); + if(providers.size()>0){ + ProviderInboxItem pii=(ProviderInboxItem)providers.get(0); + docStatus.put(docid, pii.getStatus()); + } + if(patientDocs.containsKey(demoNo)){ + docsWithPatient=patientDocs.get(demoNo); + docsWithPatient.add(docid); + patientDocs.put(demoNo,docsWithPatient); + }else{ + docsWithPatient=new ArrayList(); + docsWithPatient.add(docid); + patientDocs.put(demoNo, docsWithPatient); + } + if(queueDocNos.containsKey(qid)){ + + List<Integer> ds= (List<Integer>)queueDocNos.get(qid); + ds.add(docid); + queueDocNos.put(qid, ds); + + }else{ + List<Integer> ds=new ArrayList(); + ds.add(docid); + queueDocNos.put(qid, ds); + } + } + Integer dn=0; + for(int i=0;i<patientIds.size();i++){ + dn=patientIds.get(i); + patientIdBuf.append(dn); + if(i!=patientIds.size()-1) + patientIdBuf.append(","); + } + patientIdStr=patientIdBuf.toString(); + typeDocLab.put("DOC", ListDocIds); + List normals=ListDocIds;//assume all documents are normal + List abnormals=new ArrayList(); + request.setAttribute("typeDocLab", typeDocLab); + request.setAttribute("docStatus", docStatus); + request.setAttribute("patientDocs",patientDocs ); + request.setAttribute("patientIdNames",patientIdNames ); + request.setAttribute("docType", docType); + request.setAttribute("patientIds", patientIds); + request.setAttribute("patientIdStr",patientIdStr ); + request.setAttribute("normals", normals); + request.setAttribute("abnormals", abnormals); + request.setAttribute("queueDocNos", queueDocNos); + request.setAttribute("patientIdNamesStr",patientIdNamesStr); + request.setAttribute("queueIdNames", queueDAO.getQueuesHashtable()); + request.setAttribute("providerNo", providerNo); + request.setAttribute("searchProviderNo", searchProviderNo); + return mapping.findForward("document_in_queues"); + + + } } \ No newline at end of file |
|
From: jai <yg...@us...> - 2010-11-06 19:38:50
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22929 Modified Files: Tag: RELEASE_10_06 QueueDocumentLink.java Log Message: - ID: 3104263 -add method for new column Index: QueueDocumentLink.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/QueueDocumentLink.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** QueueDocumentLink.java 4 Jun 2010 19:17:04 -0000 1.1 --- QueueDocumentLink.java 6 Nov 2010 19:38:42 -0000 1.1.2.1 *************** *** 35,38 **** --- 35,39 ---- private int docId; private int queueId; + private String status; public int getId() { *************** *** 56,58 **** --- 57,65 ---- this.queueId=qId; } + public void setStatus(String s){ + this.status=s; + } + public String getStatus(){ + return this.status; + } } |
|
From: jai <yg...@us...> - 2010-11-06 19:38:26
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22810 Modified Files: Tag: RELEASE_10_06 QueueDocumentLink.hbm.xml Log Message: - ID: 3104263 -add new column Index: QueueDocumentLink.hbm.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/QueueDocumentLink.hbm.xml,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** QueueDocumentLink.hbm.xml 4 Jun 2010 19:16:50 -0000 1.1 --- QueueDocumentLink.hbm.xml 6 Nov 2010 19:38:18 -0000 1.1.2.1 *************** *** 27,30 **** --- 27,31 ---- <property name="queueId" column="queue_id"/> <property name="docId" column="document_id"/> + <property name="status" column="status"/> </class> </hibernate-mapping> |
