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: Jay G. <jay...@us...> - 2004-11-25 05:36:03
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscar/oscarEncounter/immunization/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32580/oscar/oscarEncounter/immunization/pageUtil Modified Files: EctImmSaveConfigAction.class Log Message: fixed bug that would throw an Exception when adding more than 1 template Index: EctImmSaveConfigAction.class =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscar/oscarEncounter/immunization/pageUtil/EctImmSaveConfigAction.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvspB9xOY and /tmp/cvsiIn4hK differ |
|
From: Jay G. <jay...@us...> - 2004-11-25 05:36:03
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32580/src/oscar/oscarEncounter/immunization/pageUtil Modified Files: EctImmSaveConfigAction.java Log Message: fixed bug that would throw an Exception when adding more than 1 template Index: EctImmSaveConfigAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil/EctImmSaveConfigAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EctImmSaveConfigAction.java 26 Feb 2004 14:47:04 -0000 1.4 --- EctImmSaveConfigAction.java 25 Nov 2004 05:35:51 -0000 1.5 *************** *** 3,24 **** // * // * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! // * This software is published under the GPL GNU General Public License. ! // * This program is free software; you can redistribute it and/or ! // * modify it under the terms of the GNU General Public License ! // * as published by the Free Software Foundation; either version 2 ! // * of the License, or (at your option) any later version. * ! // * This program is distributed in the hope that it will be useful, ! // * but WITHOUT ANY WARRANTY; without even the implied warranty of ! // * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! // * along with this program; if not, write to the Free Software ! // * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! // * // * <OSCAR TEAM> ! // * This software was written for the ! // * Department of Family Medicine ! // * McMaster Unviersity ! // * Hamilton ! // * Ontario, Canada // * // ----------------------------------------------------------------------------------------------------------------------- --- 3,24 ---- // * // * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! // * This software is published under the GPL GNU General Public License. ! // * This program is free software; you can redistribute it and/or ! // * modify it under the terms of the GNU General Public License ! // * as published by the Free Software Foundation; either version 2 ! // * of the License, or (at your option) any later version. * ! // * This program is distributed in the hope that it will be useful, ! // * but WITHOUT ANY WARRANTY; without even the implied warranty of ! // * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! // * along with this program; if not, write to the Free Software ! // * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! // * // * <OSCAR TEAM> ! // * This software was written for the ! // * Department of Family Medicine ! // * McMaster Unviersity ! // * Hamilton ! // * Ontario, Canada // * // ----------------------------------------------------------------------------------------------------------------------- *************** *** 49,95 **** public final class EctImmSaveConfigAction extends Action { ! ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException ! { ! //System.out.println("Save Config Action Jackson"); ! Locale locale = getLocale(request); ! MessageResources messages = getResources(request); ! ActionErrors errors = new ActionErrors(); ! EctSessionBean bean = null; ! bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean"); ! try ! { ! //String sCfgDoc = UtilMisc.decode64(request.getParameter("xmlDoc")); ! //Document cfgDoc = UtilXML.parseXML(sCfgDoc); ! //NodeList cfgSets = cfgDoc.getElementsByTagName("immunizationSet"); ! ! EctImmImmunizationData imm = new EctImmImmunizationData(); ! String sDoc = imm.getImmunizations(bean.demographicNo); ! Document doc; ! Element root; ! try { ! doc = UtilXML.parseXML(sDoc); ! root = doc.getDocumentElement(); ! } catch(Exception ex) { ! doc = UtilXML.newDocument(); ! root = UtilXML.addNode(doc, "immunizations"); ! } ! //add new src ! String[] setId = request.getParameterValues("chkSet"); ! if (setId == null) return mapping.findForward("success"); ! ! for (int i=0; i<setId.length; i++) { ! String sCfgDoc = (new EctImmImmunizationSetData()).getSetXMLDoc(setId[i]); ! Document cfgDoc = UtilXML.parseXML(sCfgDoc); ! NodeList cfgSets = cfgDoc.getElementsByTagName("immunizationSet"); ! ! Element cfgSet = (Element)cfgSets.item(i); ! Node nod = doc.importNode(cfgSet, true); ! root.appendChild(nod); ! ! } ! ! /* for(int i = 0; i < cfgSets.getLength(); i++) { if(request.getParameter("chkSet".concat(String.valueOf(String.valueOf(i)))) != null && request.getParameter("chkSet".concat(String.valueOf(String.valueOf(i)))).equalsIgnoreCase("on")) --- 49,91 ---- public final class EctImmSaveConfigAction extends Action { ! ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException { ! //System.out.println("Save Config Action Jackson"); ! Locale locale = getLocale(request); ! MessageResources messages = getResources(request); ! ActionErrors errors = new ActionErrors(); ! EctSessionBean bean = null; ! bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean"); ! try { ! //String sCfgDoc = UtilMisc.decode64(request.getParameter("xmlDoc")); ! //Document cfgDoc = UtilXML.parseXML(sCfgDoc); ! //NodeList cfgSets = cfgDoc.getElementsByTagName("immunizationSet"); ! ! EctImmImmunizationData imm = new EctImmImmunizationData(); ! String sDoc = imm.getImmunizations(bean.demographicNo); ! Document doc; ! Element root; ! try { ! doc = UtilXML.parseXML(sDoc); ! root = doc.getDocumentElement(); ! } catch(Exception ex) { ! doc = UtilXML.newDocument(); ! root = UtilXML.addNode(doc, "immunizations"); ! } ! //add new src ! String[] setId = request.getParameterValues("chkSet"); ! if (setId == null) return mapping.findForward("success"); ! ! for (int i=0; i<setId.length; i++) { ! String sCfgDoc = (new EctImmImmunizationSetData()).getSetXMLDoc(setId[i]); ! Document cfgDoc = UtilXML.parseXML(sCfgDoc); ! NodeList cfgSets = cfgDoc.getElementsByTagName("immunizationSet"); ! Element cfgSet = (Element)cfgSets.item(0); ! Node nod = doc.importNode(cfgSet, true); ! root.appendChild(nod); ! } ! ! /* for(int i = 0; i < cfgSets.getLength(); i++) { if(request.getParameter("chkSet".concat(String.valueOf(String.valueOf(i)))) != null && request.getParameter("chkSet".concat(String.valueOf(String.valueOf(i)))).equalsIgnoreCase("on")) *************** *** 100,113 **** } } ! */ ! if (doc != null) { ! String sXML = UtilXML.toXML(doc); ! imm.saveImmunizations(bean.demographicNo, bean.providerNo, sXML); ! } ! //System.out.println("after save imm"); ! } catch(Exception ex) { ! throw new ServletException("Exception occurred in SaveConfigAction", ex); ! } ! return mapping.findForward("success"); ! } } --- 96,110 ---- } } ! */ ! if (doc != null) { ! String sXML = UtilXML.toXML(doc); ! imm.saveImmunizations(bean.demographicNo, bean.providerNo, sXML); ! } ! //System.out.println("after save imm"); ! } catch(Exception ex) { ! ex.printStackTrace(); ! throw new ServletException("Exception occurred in SaveConfigAction", ex); ! } ! return mapping.findForward("success"); ! } } |
|
From: Jay G. <jay...@us...> - 2004-11-25 05:21:21
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29917 Modified Files: oscarResources_en.properties Log Message: changed label from Create Immu. Template to Manage Immu. Template Index: oscarResources_en.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v retrieving revision 1.130 retrieving revision 1.131 diff -C2 -d -r1.130 -r1.131 *** oscarResources_en.properties 18 Nov 2004 18:13:44 -0000 1.130 --- oscarResources_en.properties 25 Nov 2004 05:21:11 -0000 1.131 *************** *** 1243,1247 **** oscarEncounter.immunization.ScheduleConfig.btnConfig=Config oscarEncounter.immunization.ScheduleConfig.btnSaveConfig=Save Configuration ! oscarEncounter.immunization.ScheduleConfig.createTemplate=Create Immu. Template oscarEncounter.immunization.ScheduleConfig.addTemplate=Add. Immu. Template --- 1243,1247 ---- oscarEncounter.immunization.ScheduleConfig.btnConfig=Config oscarEncounter.immunization.ScheduleConfig.btnSaveConfig=Save Configuration ! oscarEncounter.immunization.ScheduleConfig.createTemplate=Manage Immu. Template oscarEncounter.immunization.ScheduleConfig.addTemplate=Add. Immu. Template |
|
From: Ivy C. <ic...@us...> - 2004-11-24 20:07:25
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3542 Modified Files: billingReview.jsp Log Message: added Q012A code Index: billingReview.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingReview.jsp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** billingReview.jsp 5 Nov 2004 21:43:33 -0000 1.13 --- billingReview.jsp 24 Nov 2004 20:07:12 -0000 1.14 *************** *** 323,327 **** BigDecimal otherperc01 = bdotherFee.multiply(otherunit).setScale(4, BigDecimal.ROUND_HALF_UP); ! if (otherdbcode1.compareTo("E411A") == 0 || scode.compareTo("E410A") == 0 || scode.compareTo("E409A") == 0) { eCode = otherdbcode1; eDesc = otherdesc1; --- 323,327 ---- BigDecimal otherperc01 = bdotherFee.multiply(otherunit).setScale(4, BigDecimal.ROUND_HALF_UP); ! if (otherdbcode1.compareTo("E411A") == 0 || scode.compareTo("E410A") == 0 || scode.compareTo("E409A") == 0 || otherdbcode1.compareTo("Q012A") == 0) { eCode = otherdbcode1; eDesc = otherdesc1; *************** *** 351,355 **** otherstr = sotherBuffer.toString(); ! if (otherdbcode1.compareTo("Z777A")==0 || otherdbcode1.compareTo("P029A")==0 || otherdbcode1.compareTo("P028A")==0 || otherdbcode1.compareTo("Z776A")==0 || otherdbcode1.compareTo("P042A")==0 || otherdbcode1.compareTo("S768A")==0 || otherdbcode1.compareTo("S756A")==0 || otherdbcode1.compareTo("S757A")==0 || otherdbcode1.compareTo("S784A")==0 || otherdbcode1.compareTo("S745A")==0 || otherdbcode1.compareTo("P010A")==0 || otherdbcode1.compareTo("P009A")==0 || otherdbcode1.compareTo("P006A") == 0 || otherdbcode1.compareTo("P011A")==0 || otherdbcode1.compareTo("P041A") == 0 || otherdbcode1.compareTo("P018A") == 0 || otherdbcode1.compareTo("P038A") == 0 || otherdbcode1.compareTo("P020A") == 0 || otherdbcode1.compareTo("P031A") == 0 || otherdbcode1.compareTo("Z552A")==0 || otherdbcode1.compareTo("Z716A")==0 || otherdbcode1.startsWith("S") || (otherdbcode1.endsWith("B") && !otherdbcode1.endsWith("C988B") && !otherdbcode1.endsWith("C998B") && !otherdbcode1.endsWith("C999B") ) ){ pValue1 = pValue1.add(otherfee); pValue1PerUnit = pValue1PerUnit.add(bdotherFee); --- 351,369 ---- otherstr = sotherBuffer.toString(); ! if (otherdbcode1.compareTo("A001A")==0 || otherdbcode1.compareTo("A003A")==0 || ! otherdbcode1.compareTo("A004A")==0 || otherdbcode1.compareTo("A007A")==0 || ! otherdbcode1.compareTo("A008A")==0 || otherdbcode1.compareTo("A888A")==0 || ! otherdbcode1.compareTo("Z777A")==0 || otherdbcode1.compareTo("P029A")==0 || ! otherdbcode1.compareTo("P028A")==0 || otherdbcode1.compareTo("Z776A")==0 || ! otherdbcode1.compareTo("P042A")==0 || otherdbcode1.compareTo("S768A")==0 || ! otherdbcode1.compareTo("S756A")==0 || otherdbcode1.compareTo("S757A")==0 || ! otherdbcode1.compareTo("S784A")==0 || otherdbcode1.compareTo("S745A")==0 || ! otherdbcode1.compareTo("P010A")==0 || otherdbcode1.compareTo("P009A")==0 || ! otherdbcode1.compareTo("P006A")==0 || otherdbcode1.compareTo("P011A")==0 || ! otherdbcode1.compareTo("P041A")==0 || otherdbcode1.compareTo("P018A")==0 || ! otherdbcode1.compareTo("P038A")==0 || otherdbcode1.compareTo("P020A")==0 || ! otherdbcode1.compareTo("P031A")==0 || otherdbcode1.compareTo("Z552A")==0 || ! otherdbcode1.compareTo("Z716A")==0 || otherdbcode1.startsWith("S") || ! (otherdbcode1.endsWith("B") && !otherdbcode1.endsWith("C988B") && !otherdbcode1.endsWith("C998B") && !otherdbcode1.endsWith("C999B") ) ){ pValue1 = pValue1.add(otherfee); pValue1PerUnit = pValue1PerUnit.add(bdotherFee); *************** *** 389,393 **** BigDecimal otherperc02 = bdotherFee.multiply(otherunit).setScale(4, BigDecimal.ROUND_HALF_UP); ! if (otherdbcode2.compareTo("E411A") == 0 || scode.compareTo("E410A") == 0 || scode.compareTo("E409A") == 0) { eCode = otherdbcode2; eDesc = otherdesc2; --- 403,407 ---- BigDecimal otherperc02 = bdotherFee.multiply(otherunit).setScale(4, BigDecimal.ROUND_HALF_UP); ! if (otherdbcode2.compareTo("E411A") == 0 || scode.compareTo("E410A") == 0 || scode.compareTo("E409A") == 0 || otherdbcode1.compareTo("Q012A") == 0) { eCode = otherdbcode2; eDesc = otherdesc2; *************** *** 417,421 **** otherstr2 = sotherBuffer.toString(); ! if (otherdbcode1.compareTo("Z777A")==0 || otherdbcode1.compareTo("P029A")==0 || otherdbcode1.compareTo("P028A")==0 || otherdbcode2.compareTo("Z776A")==0 || otherdbcode2.compareTo("P042A")==0 || otherdbcode2.compareTo("S768A")==0 || otherdbcode2.compareTo("S756A")==0 || otherdbcode2.compareTo("S757A")==0 || otherdbcode2.compareTo("S784A")==0 || otherdbcode2.compareTo("S745A")==0 || otherdbcode2.compareTo("P010A")==0 || otherdbcode2.compareTo("P009A")==0 || otherdbcode2.compareTo("P006A") == 0 || otherdbcode2.compareTo("P011A")==0 || otherdbcode2.compareTo("P041A") == 0 || otherdbcode2.compareTo("P018A") == 0 || otherdbcode2.compareTo("P038A") == 0 || otherdbcode2.compareTo("P020A") == 0 || otherdbcode2.compareTo("P031A") == 0 || otherdbcode2.compareTo("Z552A")==0 || otherdbcode2.compareTo("Z716A")==0 || otherdbcode2.startsWith("S") || (otherdbcode2.endsWith("B") && !otherdbcode2.endsWith("C988B") && !otherdbcode2.endsWith("C998B") && !otherdbcode2.endsWith("C999B") ) ){ pValue1 = pValue1.add(otherfee02); pValue1PerUnit = pValue1PerUnit.add(bdotherFee); --- 431,449 ---- otherstr2 = sotherBuffer.toString(); ! if (otherdbcode1.compareTo("A001A")==0 || otherdbcode1.compareTo("A003A")==0 || ! otherdbcode1.compareTo("A004A")==0 || otherdbcode1.compareTo("A007A")==0 || ! otherdbcode1.compareTo("A008A")==0 || otherdbcode1.compareTo("A888A")==0 || ! otherdbcode1.compareTo("Z777A")==0 || otherdbcode1.compareTo("P029A")==0 || ! otherdbcode1.compareTo("P028A")==0 || otherdbcode2.compareTo("Z776A")==0 || ! otherdbcode2.compareTo("P042A")==0 || otherdbcode2.compareTo("S768A")==0 || ! otherdbcode2.compareTo("S756A")==0 || otherdbcode2.compareTo("S757A")==0 || ! otherdbcode2.compareTo("S784A")==0 || otherdbcode2.compareTo("S745A")==0 || ! otherdbcode2.compareTo("P010A")==0 || otherdbcode2.compareTo("P009A")==0 || ! otherdbcode2.compareTo("P006A")==0 || otherdbcode2.compareTo("P011A")==0 || ! otherdbcode2.compareTo("P041A")==0 || otherdbcode2.compareTo("P018A")==0 || ! otherdbcode2.compareTo("P038A")==0 || otherdbcode2.compareTo("P020A")==0 || ! otherdbcode2.compareTo("P031A")==0 || otherdbcode2.compareTo("Z552A")==0 || ! otherdbcode2.compareTo("Z716A")==0 || otherdbcode2.startsWith("S") || ! (otherdbcode2.endsWith("B") && !otherdbcode2.endsWith("C988B") && !otherdbcode2.endsWith("C998B") && !otherdbcode2.endsWith("C999B") ) ){ pValue1 = pValue1.add(otherfee02); pValue1PerUnit = pValue1PerUnit.add(bdotherFee); *************** *** 454,458 **** BigDecimal otherperc03 = bdotherFee.multiply(otherunit).setScale(4, BigDecimal.ROUND_HALF_UP); ! if (otherdbcode3.compareTo("E411A") == 0 || scode.compareTo("E410A") == 0 || scode.compareTo("E409A") == 0) { eCode = otherdbcode3; eDesc = otherdesc3; --- 482,486 ---- BigDecimal otherperc03 = bdotherFee.multiply(otherunit).setScale(4, BigDecimal.ROUND_HALF_UP); ! if (otherdbcode3.compareTo("E411A") == 0 || scode.compareTo("E410A") == 0 || scode.compareTo("E409A") == 0 || otherdbcode1.compareTo("Q012A") == 0) { eCode = otherdbcode3; eDesc = otherdesc3; *************** *** 482,486 **** otherstr3 = sotherBuffer.toString(); ! if (otherdbcode1.compareTo("Z777A")==0 || otherdbcode1.compareTo("P029A")==0 || otherdbcode1.compareTo("P028A")==0 || otherdbcode3.compareTo("Z776A")==0 || otherdbcode3.compareTo("P042A")==0 || otherdbcode3.compareTo("S768A")==0 || otherdbcode3.compareTo("S756A")==0 || otherdbcode3.compareTo("S757A")==0 || otherdbcode3.compareTo("S784A")==0 || otherdbcode3.compareTo("S745A")==0 || otherdbcode3.compareTo("P010A")==0 || otherdbcode3.compareTo("P009A")==0 || otherdbcode3.compareTo("P006A") == 0 || otherdbcode3.compareTo("P011A")==0 || otherdbcode3.compareTo("P041A") == 0 || otherdbcode3.compareTo("P018A") == 0 || otherdbcode3.compareTo("P038A") == 0 || otherdbcode3.compareTo("P020A") == 0 || otherdbcode3.compareTo("P031A") == 0 || otherdbcode3.compareTo("Z552A")==0 || otherdbcode3.compareTo("Z716A")==0 || otherdbcode3.startsWith("S") || (otherdbcode3.endsWith("B") && !otherdbcode3.endsWith("C988B") && !otherdbcode3.endsWith("C998B") && !otherdbcode3.endsWith("C999B") ) ){ pValue1 = pValue1.add(otherfee03); pValue1PerUnit = pValue1PerUnit.add(bdotherFee); --- 510,528 ---- otherstr3 = sotherBuffer.toString(); ! if (otherdbcode1.compareTo("A001A")==0 || otherdbcode1.compareTo("A003A")==0 || ! otherdbcode1.compareTo("A004A")==0 || otherdbcode1.compareTo("A007A")==0 || ! otherdbcode1.compareTo("A008A")==0 || otherdbcode1.compareTo("A888A")==0 || ! otherdbcode1.compareTo("Z777A")==0 || otherdbcode1.compareTo("P029A")==0 || ! otherdbcode1.compareTo("P028A")==0 || otherdbcode3.compareTo("Z776A")==0 || ! otherdbcode3.compareTo("P042A")==0 || otherdbcode3.compareTo("S768A")==0 || ! otherdbcode3.compareTo("S756A")==0 || otherdbcode3.compareTo("S757A")==0 || ! otherdbcode3.compareTo("S784A")==0 || otherdbcode3.compareTo("S745A")==0 || ! otherdbcode3.compareTo("P010A")==0 || otherdbcode3.compareTo("P009A")==0 || ! otherdbcode3.compareTo("P006A")==0 || otherdbcode3.compareTo("P011A")==0 || ! otherdbcode3.compareTo("P041A")==0 || otherdbcode3.compareTo("P018A")==0 || ! otherdbcode3.compareTo("P038A")==0 || otherdbcode3.compareTo("P020A")==0 || ! otherdbcode3.compareTo("P031A")==0 || otherdbcode3.compareTo("Z552A")==0 || ! otherdbcode3.compareTo("Z716A")==0 || otherdbcode3.startsWith("S") || ! (otherdbcode3.endsWith("B") && !otherdbcode3.endsWith("C988B") && !otherdbcode3.endsWith("C998B") && !otherdbcode3.endsWith("C999B") ) ){ pValue1 = pValue1.add(otherfee03); pValue1PerUnit = pValue1PerUnit.add(bdotherFee); *************** *** 542,546 **** }else{ if (fee.compareTo(".00")==0) { ! if (scode.compareTo("E411A") == 0 || scode.compareTo("E410A") == 0 || scode.compareTo("E409A") == 0) { eCode = scode; eDesc = desc; --- 584,588 ---- }else{ if (fee.compareTo(".00")==0) { ! if (scode.compareTo("E411A") == 0 || scode.compareTo("E410A") == 0 || scode.compareTo("E409A") == 0 || otherdbcode1.compareTo("Q012A") == 0) { eCode = scode; eDesc = desc; *************** *** 562,566 **** BigTotal = BigTotal.add(bdFee); ! if (otherdbcode1.compareTo("Z777A")==0 || otherdbcode1.compareTo("P029A")==0 || scode.compareTo("P028A")==0 || scode.compareTo("Z776A")==0 || scode.compareTo("P042A")==0 || scode.compareTo("S768A")==0 || scode.compareTo("S756A")==0 || scode.compareTo("S757A")==0 || scode.compareTo("S784A")==0 || scode.compareTo("S745A")==0 || scode.compareTo("P010A")==0 || scode.compareTo("P009A")==0 || scode.compareTo("P006A") == 0 || scode.compareTo("P011A")==0 || scode.compareTo("P041A") == 0 || scode.compareTo("P018A") == 0 || scode.compareTo("P038A") == 0 || scode.compareTo("P020A") == 0 || scode.compareTo("P031A") == 0 || scode.compareTo("Z552A")==0 || scode.compareTo("Z716A")==0 || scode.startsWith("S") || (scode.endsWith("B") && !scode.endsWith("C988B") && !scode.endsWith("C998B") && !scode.endsWith("C999B") ) ){ pValue1 = pValue1.add(bdFee); pValue1PerUnit = pValue1PerUnit.add(bdFee); --- 604,622 ---- BigTotal = BigTotal.add(bdFee); ! if (scode.compareTo("A001A")==0 || scode.compareTo("A003A")==0 || ! scode.compareTo("A004A")==0 || scode.compareTo("A007A")==0 || ! scode.compareTo("A008A")==0 || scode.compareTo("A888A")==0 || ! scode.compareTo("Z777A")==0 || scode.compareTo("P029A")==0 || ! scode.compareTo("P028A")==0 || scode.compareTo("Z776A")==0 || ! scode.compareTo("P042A")==0 || scode.compareTo("S768A")==0 || ! scode.compareTo("S756A")==0 || scode.compareTo("S757A")==0 || ! scode.compareTo("S784A")==0 || scode.compareTo("S745A")==0 || ! scode.compareTo("P010A")==0 || scode.compareTo("P009A")==0 || ! scode.compareTo("P006A")==0 || scode.compareTo("P011A")==0 || ! scode.compareTo("P041A")==0 || scode.compareTo("P018A")==0 || ! scode.compareTo("P038A")==0 || scode.compareTo("P020A")==0 || ! scode.compareTo("P031A")==0 || scode.compareTo("Z552A")==0 || ! scode.compareTo("Z716A")==0 || scode.startsWith("S") || ! (scode.endsWith("B") && !scode.endsWith("C988B") && !scode.endsWith("C998B") && !scode.endsWith("C999B") ) ){ pValue1 = pValue1.add(bdFee); pValue1PerUnit = pValue1PerUnit.add(bdFee); |
|
From: Ivy C. <ic...@us...> - 2004-11-24 16:58:04
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25690 Modified Files: EctFormData.java Log Message: added getFormNameByFormTable() Index: EctFormData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/data/EctFormData.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** EctFormData.java 19 Jul 2004 04:58:27 -0000 1.9 --- EctFormData.java 24 Nov 2004 16:57:51 -0000 1.10 *************** *** 67,70 **** --- 67,72 ---- } + public Form(){} + public String getFormName() { return formName; *************** *** 80,83 **** --- 82,86 ---- return hidden; } + } *************** *** 162,165 **** --- 165,185 ---- return ret; } + + public String getFormNameByFormTable(String value){ + String formName = ""; + try{ + DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); + String sql = "SELECT form_name from encounterForm where form_value='" + value + "'"; + ResultSet rs = db.GetSQL(sql); + if (rs.next()) + formName = rs.getString("form_name"); + rs.close(); + db.CloseConn(); + } + catch(SQLException e){ + e.printStackTrace(); + } + return formName; + } } |
|
From: Ivy C. <ic...@us...> - 2004-11-24 02:16:19
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1117 Modified Files: Index.jsp Log Message: removed the link to SetupVTForm.do from the add new form drop down box Index: Index.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/Index.jsp,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** Index.jsp 18 Oct 2004 22:52:57 -0000 1.67 --- Index.jsp 24 Nov 2004 02:14:41 -0000 1.68 *************** *** 31,35 **** <%@ taglib uri="/WEB-INF/rewrite-tag.tld" prefix="rewrite" %> ! <%@page import="oscar.util.UtilMisc,oscar.oscarEncounter.data.*,java.net.*,java.util.Properties"%> <%@page import="oscar.oscarMDS.data.MDSResultsData"%> <jsp:useBean id="oscarVariables" class="java.util.Properties" scope="session" /> --- 31,35 ---- <%@ taglib uri="/WEB-INF/rewrite-tag.tld" prefix="rewrite" %> ! <%@page import="oscar.util.UtilMisc,oscar.oscarEncounter.data.*, oscar.oscarWaitingList.WaitingList, java.net.*,java.util.Properties"%> <%@page import="oscar.oscarMDS.data.MDSResultsData"%> <jsp:useBean id="oscarVariables" class="java.util.Properties" scope="session" /> *************** *** 637,646 **** EctFormData.Form frm = forms[j]; String table = frm.getFormTable(); ! EctFormData.PatientForm[] pforms = new EctFormData().getPatientForms(demoNo, table); ! if(pforms.length>0) { ! EctFormData.PatientForm pfrm = pforms[0]; ! %> ! <option value="<%="../form/forwardshortcutname.jsp?formname="+frm.getFormName()+"&demographic_no="+demoNo%>"><%=frm.getFormName()%> Cr:<%=pfrm.getCreated()%> Ed:<%=pfrm.getEdited()%> ! <%}} %> --- 637,647 ---- EctFormData.Form frm = forms[j]; String table = frm.getFormTable(); ! if(!table.equalsIgnoreCase("")){ ! EctFormData.PatientForm[] pforms = new EctFormData().getPatientForms(demoNo, table); ! if(pforms.length>0) { ! EctFormData.PatientForm pfrm = pforms[0]; ! %> ! <option value="<%="../form/forwardshortcutname.jsp?formname="+frm.getFormName()+"&demographic_no="+demoNo%>"><%=frm.getFormName()%> Cr:<%=pfrm.getCreated()%> Ed:<%=pfrm.getEdited()%> ! <%}}} %> *************** *** 664,669 **** } ! %> ! <option value="oscarMeasurements/oscarForm/SetupVTForm.do"/>VT </select> --- 665,669 ---- } ! %> </select> |
|
From: Ivy C. <ic...@us...> - 2004-11-23 21:10:49
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28603 Modified Files: oscarinit.sql Log Message: added formVTForm Index: oscarinit.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** oscarinit.sql 19 Nov 2004 01:47:04 -0000 1.63 --- oscarinit.sql 23 Nov 2004 21:10:07 -0000 1.64 *************** *** 4654,4657 **** --- 4654,4894 ---- -- + -- Table structure for table `formVTForm` + -- + CREATE TABLE formVTForm( + ID int(10) NOT NULL auto_increment , + demographic_no int(10) NOT NULL, + provider_no int(10), + formCreated date, + formEdited timestamp NOT NULL, + HTValue varchar(10), + HTDate varchar(10), + HTComments varchar(255), + HTLastData varchar(10), + HTLastDataEnteredDate varchar(10), + WTValue varchar(10), + WTDate varchar(10), + WTComments varchar(255), + WTLastData varchar(10), + WTLastDataEnteredDate varchar(10), + WCValue varchar(10), + WCDate varchar(10), + WCComments varchar(255), + WCLastData varchar(10), + WCLastDataEnteredDate varchar(10), + HCValue varchar(10), + HCDate varchar(10), + HCComments varchar(255), + HCLastData varchar(10), + HCLastDataEnteredDate varchar(10), + BPValue varchar(10), + BPDate varchar(10), + BPComments varchar(255), + BPLastData varchar(10), + BPLastDataEnteredDate varchar(10), + HRValue varchar(10), + HRDate varchar(10), + HRComments varchar(255), + HRLastData varchar(10), + HRLastDataEnteredDate varchar(10), + HbA1Value varchar(10), + HbA1Date varchar(10), + HbA1Comments varchar(255), + HbA1LastData varchar(10), + HbA1LastDataEnteredDate varchar(10), + BGValue varchar(10), + BGDate varchar(10), + BGComments varchar(255), + BGLastData varchar(10), + BGLastDataEnteredDate varchar(10), + LDLValue varchar(10), + LDLDate varchar(10), + LDLComments varchar(255), + LDLLastData varchar(10), + LDLLastDataEnteredDate varchar(10), + HDLValue varchar(10), + HDLDate varchar(10), + HDLComments varchar(255), + HDLLastData varchar(10), + HDLLastDataEnteredDate varchar(10), + TCHLValue varchar(10), + TCHLDate varchar(10), + TCHLComments varchar(255), + THCLLastData varchar(10), + THCLLastDataEnteredDate varchar(10), + TRIGValue varchar(10), + TRIGDate varchar(10), + TRIGComments varchar(255), + TRIGLastData varchar(10), + TRIGLastDataEnteredDate varchar(10), + UALBValue varchar(10), + UALBDate varchar(10), + UALBComments varchar(255), + UALBLastData varchar(10), + UALBLastDataEnteredDate varchar(10), + 24UAValue varchar(10), + 24UADate varchar(10), + 24UAComments varchar(255), + 24UALastData varchar(10), + 24UALastDataEnteredDate varchar(10), + FTNoValue varchar(10), + FTNoDate varchar(10), + FTNoComments varchar(255), + FTNoLastData varchar(10), + FTNoLastDataEnteredDate varchar(10), + FTNeValue varchar(10), + FTNeDate varchar(10), + FTNeComments varchar(255), + FTNeLastData varchar(10), + FTNeLastDataEnteredDate varchar(10), + FTIsValue varchar(10), + FTIsDate varchar(10), + FTIsComments varchar(255), + FTIsLastData varchar(10), + FTIsLastDataEnteredDate varchar(10), + FTUlValue varchar(10), + FTUlDate varchar(10), + FTUlComments varchar(255), + FTUlLastData varchar(10), + FTUlLastDataEnteredDate varchar(10), + FTInValue varchar(10), + FTInDate varchar(10), + FTInComments varchar(255), + FTInLastData varchar(10), + FTInLastDataEnteredDate varchar(10), + FTOtValue varchar(10), + FTOtDate varchar(10), + FTOtComments varchar(255), + FTOtLastData varchar(10), + FTOtLastDataEnteredDate varchar(10), + FTReValue varchar(10), + FTReDate varchar(10), + FTReComments varchar(255), + FTReLastData varchar(10), + FTReLastDataEnteredDate varchar(10), + iNoValue varchar(10), + iNoDate varchar(10), + iNoComments varchar(255), + iNoLastData varchar(10), + iNoLastDataEnteredDate varchar(10), + iDiaValue varchar(10), + iDiaDate varchar(10), + iDiaComments varchar(255), + iDiaLastData varchar(10), + iDiaLastDataEnteredDate varchar(10), + iHypValue varchar(10), + iHypDate varchar(10), + iHypComments varchar(255), + iHypLastData varchar(10), + iHypLastDataEnteredDate varchar(10), + iOthValue varchar(10), + iOthDate varchar(10), + iOthComments varchar(255), + iOthLastData varchar(10), + iOthLastDataEnteredDate varchar(10), + iRefValue varchar(10), + iRefDate varchar(10), + iRefComments varchar(255), + iRefLastData varchar(10), + iRefLastDataEnteredDate varchar(10), + SmkSValue varchar(10), + SmkSDate varchar(10), + SmkSComments varchar(255), + SmkSLastData varchar(10), + SmkSLastDataEnteredDate varchar(10), + SmkHValue varchar(10), + SmkHDate varchar(10), + SmkHComments varchar(255), + SmkHLastData varchar(10), + SmkHLastDataEnteredDate varchar(10), + SmkCValue varchar(10), + SmkCDate varchar(10), + SmkCComments varchar(255), + SmkCLastData varchar(10), + SmkCLastDataEnteredDate varchar(10), + ExerValue varchar(10), + ExerDate varchar(10), + ExerComments varchar(255), + ExerLastData varchar(10), + ExerLastDataEnteredDate varchar(10), + DietValue varchar(10), + DietDate varchar(10), + DietComments varchar(255), + DietLastData varchar(10), + DietLastDataEnteredDate varchar(10), + DpScValue varchar(10), + DpScDate varchar(10), + DpScComments varchar(255), + DpScLastData varchar(10), + DpScLastDataEnteredDate varchar(10), + StScValue varchar(10), + StScDate varchar(10), + StScComments varchar(255), + StScLastData varchar(10), + StScLastDataEnteredDate varchar(10), + LcCtValue varchar(10), + LcCtDate varchar(10), + LcCtComments varchar(255), + LcCtLastData varchar(10), + LcCtLastDataEnteredDate varchar(10), + MedGValue varchar(10), + MedGDate varchar(10), + MedGComments varchar(255), + MedGLastData varchar(10), + MedGLastDataEnteredDate varchar(10), + MedNValue varchar(10), + MedNDate varchar(10), + MedNComments varchar(255), + MedNLastData varchar(10), + MedNLastDataEnteredDate varchar(10), + MedRValue varchar(10), + MedRDate varchar(10), + MedRComments varchar(255), + MedRLastData varchar(10), + MedRLastDataEnteredDate varchar(10), + MedAValue varchar(10), + MedADate varchar(10), + MedAComments varchar(255), + MedALastData varchar(10), + MedALastDataEnteredDate varchar(10), + NtrCValue varchar(10), + NtrCDate varchar(10), + NtrCComments varchar(255), + NtrCLastData varchar(10), + NtrCLastDataEnteredDate varchar(10), + ExeCValue varchar(10), + ExeCDate varchar(10), + ExeCComments varchar(255), + ExeCLastData varchar(10), + ExeCLastDataEnteredDate varchar(10), + SmCCValue varchar(10), + SmCCDate varchar(10), + SmCCComments varchar(255), + SmCCLastData varchar(10), + SmCCLastDataEnteredDate varchar(10), + DiaCValue varchar(10), + DiaCDate varchar(10), + DiaCComments varchar(255), + DiaCLastData varchar(10), + DiaCLastDataEnteredDate varchar(10), + PsyCValue varchar(10), + PsyCDate varchar(10), + PsyCComments varchar(255), + PsyCLastData varchar(10), + PsyCLastDataEnteredDate varchar(10), + OthCValue varchar(10), + OthCDate varchar(10), + OthCComments varchar(255), + OthCLastData varchar(10), + OthCLastDataEnteredDate varchar(10), + + PRIMARY KEY (ID), + INDEX (ID), + INDEX (demographic_no) + + ) TYPE=MyISAM; + + + -- -- Table structure for table `groupMembers_tbl` -- |
|
From: Ivy C. <ic...@us...> - 2004-11-23 20:56:40
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24894 Modified Files: FrmFormAction.java Log Message: write to measurement table only when the input value is not blank Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FrmFormAction.java 23 Nov 2004 20:10:40 -0000 1.2 --- FrmFormAction.java 23 Nov 2004 20:56:08 -0000 1.3 *************** *** 113,116 **** --- 113,117 ---- // System.out.println("validate each input: " + valid + " " + mt.getType() + " value:" + inputValue); } + long endTime = System.currentTimeMillis(); long delTime = endTime - startTime; *************** *** 140,144 **** //Write to Measurement Table ! if(inputValue.equalsIgnoreCase("")) write2MeasurementTable(demographicNo, providerNo, mt, inputValue, observationDate, comments); --- 141,145 ---- //Write to Measurement Table ! if(!inputValue.equalsIgnoreCase("")) write2MeasurementTable(demographicNo, providerNo, mt, inputValue, observationDate, comments); *************** *** 190,193 **** --- 191,198 ---- } + + + + private boolean validate(String inputValue, String observationDate, EctMeasurementTypesBean mt, EctValidationsBean validation, HttpServletRequest request ){ EctValidation ectValidation = new EctValidation(); *************** *** 251,259 **** } private boolean write2MeasurementTable(String demographicNo, String providerNo, EctMeasurementTypesBean mt, String inputValue, String dateObserved, String comments){ boolean newDataAdded = false; ! System.out.println("writing to Measurement: " + mt.getType() + " value: " + inputValue + " dateObserved: " + dateObserved); try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); --- 256,267 ---- } + + + private boolean write2MeasurementTable(String demographicNo, String providerNo, EctMeasurementTypesBean mt, String inputValue, String dateObserved, String comments){ boolean newDataAdded = false; ! //System.out.println("writing to Measurement: " + mt.getType() + " value: " + inputValue + " dateObserved: " + dateObserved); try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); |
|
From: Ivy C. <ic...@us...> - 2004-11-23 20:10:55
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13384 Modified Files: FrmSetupFormAction.java FrmFormAction.java Log Message: added get/save data from/to form table Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FrmFormAction.java 18 Nov 2004 18:24:20 -0000 1.1 --- FrmFormAction.java 23 Nov 2004 20:10:40 -0000 1.2 *************** *** 39,44 **** --- 39,46 ---- import org.apache.xmlrpc.XmlRpcException; import oscar.form.*; + import oscar.form.data.*; import oscar.oscarDB.DBHandler; import oscar.oscarMessenger.util.MsgStringQuote; + import oscar.oscarEncounter.data.EctFormData; import oscar.oscarEncounter.pageUtil.EctSessionBean; import oscar.oscarEncounter.oscarMeasurements.pageUtil.EctValidation; *************** *** 60,72 **** **/ - private boolean valid = true; - private String _dateFormat = "yyyy/MM/dd"; - ActionErrors errors = new ActionErrors(); public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ! FrmFormForm frm = (FrmFormForm) form; HttpSession session = request.getSession(); --- 62,78 ---- **/ + private String _dateFormat = "yyyy/MM/dd"; + ActionErrors errors = new ActionErrors(); + boolean valid = true; public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ! ! ! System.out.println("FrmFormAction is called"); ! ! FrmFormForm frm = (FrmFormForm) form; HttpSession session = request.getSession(); *************** *** 76,79 **** --- 82,86 ---- String formName = (String) frm.getValue("formName"); + String formId = (String) frm.getValue("formId"); String dateEntered = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); *************** *** 87,93 **** --- 94,103 ---- errors.clear(); + valid = true; //Validate each measurement + long startTime = System.currentTimeMillis(); for(int i=0; i<measurementTypes.size(); i++){ + EctMeasurementTypesBean mt = (EctMeasurementTypesBean) measurementTypes.elementAt(i); EctValidationsBean validation = (EctValidationsBean) mt.getValidationRules().elementAt(0); *************** *** 99,106 **** //validate ! valid = validate(inputValue, observationDate, mt, validation, request); ! } ! if(valid){ //Store form information as properties for saving to form table props.setProperty("demographic_no", demographicNo); --- 109,122 ---- //validate ! valid = validate( inputValue, observationDate, mt, validation, request); ! //if(!valid) ! // System.out.println("validate each input: " + valid + " " + mt.getType() + " value:" + inputValue); ! } ! long endTime = System.currentTimeMillis(); ! long delTime = endTime - startTime; ! System.out.println("Time spent on validation: " + Long.toString(delTime)); ! if(valid){ + System.out.println("is valid, procede write to table"); //Store form information as properties for saving to form table props.setProperty("demographic_no", demographicNo); *************** *** 108,116 **** props.setProperty("formCreated", dateEntered); for(int i=0; i<measurementTypes.size(); i++){ EctMeasurementTypesBean mt = (EctMeasurementTypesBean) measurementTypes.elementAt(i); EctValidationsBean validation = (EctValidationsBean) mt.getValidationRules().elementAt(0); String type = mt.getType(); ! String inputValue = (String) frm.getValue(type+"Value"); String observationDate = (String) frm.getValue(type+"Date"); String comments = (String) frm.getValue(type+"Comments"); --- 124,135 ---- props.setProperty("formCreated", dateEntered); + startTime = System.currentTimeMillis(); for(int i=0; i<measurementTypes.size(); i++){ EctMeasurementTypesBean mt = (EctMeasurementTypesBean) measurementTypes.elementAt(i); EctValidationsBean validation = (EctValidationsBean) mt.getValidationRules().elementAt(0); String type = mt.getType(); ! String inputValue = (String) frm.getValue(type+"Value"); ! String lastData = (String) frm.getValue(type+"LastData"); ! String lastDataEnteredDate = (String) frm.getValue(type+"LastDataEnteredDate"); String observationDate = (String) frm.getValue(type+"Date"); String comments = (String) frm.getValue(type+"Comments"); *************** *** 121,133 **** //Write to Measurement Table ! write2MeasurementTable(demographicNo, providerNo, mt, inputValue, observationDate, comments); //Store all input value as properties for saving to form table props.setProperty(type+"Value", inputValue); props.setProperty(type+"Date", observationDate); props.setProperty(type+"Comments", comments); } - //Save to formTable try{ String sql = "SELECT * FROM form"+formName + " WHERE demographic_no='"+demographicNo + "' AND ID=0"; --- 140,159 ---- //Write to Measurement Table ! if(inputValue.equalsIgnoreCase("")) ! write2MeasurementTable(demographicNo, providerNo, mt, inputValue, observationDate, comments); //Store all input value as properties for saving to form table + if(lastData!=null) + props.setProperty(type+"LastData", lastData); + if(lastDataEnteredDate!=null) + props.setProperty(type+"LastDataEnteredDate", lastDataEnteredDate); props.setProperty(type+"Value", inputValue); props.setProperty(type+"Date", observationDate); props.setProperty(type+"Comments", comments); } + endTime = System.currentTimeMillis(); + delTime = endTime - startTime; + System.out.println("Time spent on write2Measurements: " + Long.toString(delTime)); try{ String sql = "SELECT * FROM form"+formName + " WHERE demographic_no='"+demographicNo + "' AND ID=0"; *************** *** 141,154 **** //Send to Mils thru xml-rpc ! props.setProperty("VisitDate", dateEntered); ! connect2OSDSF(props, formName); } ! else{ ! return (new ActionForward("/form/SetupForm.do?formName="+formName)); } //return mapping.findForward("success"); ! return (new ActionForward("/form/SetupForm.do?formName="+formName)); } --- 167,191 ---- //Send to Mils thru xml-rpc ! //props.setProperty("VisitDate", dateEntered); ! //connect2OSDSF(props, formName); } ! else{ ! //return to the orignal form ! return (new ActionForward("/form/SetupForm.do?formName="+formName+"&formId=0")); } //return mapping.findForward("success"); ! //forward to the for with updated formId ! EctFormData fData = new EctFormData(); ! String formNameByFormTable = fData.getFormNameByFormTable("../form/SetupForm.do?formName="+formName+"&demographic_no="); ! String[] formPath = {"","0"}; ! try{ ! formPath = (new FrmData()).getShortcutFormValue(demographicNo, formNameByFormTable); ! } ! catch(SQLException e){ ! e.printStackTrace(); ! } ! return (new ActionForward("/form/SetupForm.do?formName="+formName+"&formId="+formPath[1])); } *************** *** 160,163 **** --- 197,201 ---- String inputDateName = mt.getType()+"Date"; String regExp = validation.getRegularExp(); + //System.out.println("Input Value of " + mt.getType() + ":" + inputValue); double dMax = Double.parseDouble(validation.getMaxValue()==null?"0":validation.getMaxValue()); *************** *** 166,202 **** int iMin = Integer.parseInt(validation.getMinLength()==null?"0":validation.getMinLength()); int iIsDate = Integer.parseInt(validation.getIsDate()==null?"0":validation.getIsDate()); ! if(!ectValidation.isInRange(dMax, dMin, inputValue)){ ! errors.add(inputValueName, new ActionError("errors.range", inputTypeDisplay, Double.toString(dMin), Double.toString(dMax))); ! saveErrors(request, errors); ! valid = false; ! } ! if(!ectValidation.maxLength(iMax, inputValue)){ ! errors.add(inputValueName, new ActionError("errors.maxlength", inputTypeDisplay, Integer.toString(iMax))); ! saveErrors(request, errors); ! valid = false; ! } ! if(!ectValidation.minLength(iMin, inputValue)){ ! errors.add(inputValueName, new ActionError("errors.minlength", inputTypeDisplay, Integer.toString(iMin))); ! saveErrors(request, errors); ! valid = false; ! } ! if(!ectValidation.matchRegExp(regExp, inputValue)){ ! errors.add(inputValueName, ! new ActionError("errors.invalid", inputTypeDisplay)); ! saveErrors(request, errors); ! valid = false; ! } ! if(!ectValidation.isValidBloodPressure(regExp, inputValue)){ ! errors.add(inputValueName, ! new ActionError("error.bloodPressure")); ! saveErrors(request, errors); ! valid = false; ! } ! if(inputValue.compareTo("")!=0 && iIsDate==1 && !ectValidation.isDate(inputValue)){ ! errors.add(inputValueName, ! new ActionError("errors.invalidDate", inputTypeDisplay)); ! saveErrors(request, errors); ! valid = false; } if(!ectValidation.isDate(observationDate)&&inputValue.compareTo("")!=0){ --- 204,244 ---- int iMin = Integer.parseInt(validation.getMinLength()==null?"0":validation.getMinLength()); int iIsDate = Integer.parseInt(validation.getIsDate()==null?"0":validation.getIsDate()); + int iIsNumeric = Integer.parseInt(validation.getIsNumeric()==null?"0":validation.getIsNumeric()); ! org.apache.commons.validator.GenericValidator gValidator = new org.apache.commons.validator.GenericValidator(); ! if(!gValidator.isBlankOrNull(inputValue)){ ! if(iIsNumeric==1 && !ectValidation.isInRange(dMax, dMin, inputValue)){ ! errors.add(inputValueName, new ActionError("errors.range", inputTypeDisplay, Double.toString(dMin), Double.toString(dMax))); ! saveErrors(request, errors); ! valid = false; ! } ! if(!ectValidation.maxLength(iMax, inputValue)){ ! errors.add(inputValueName, new ActionError("errors.maxlength", inputTypeDisplay, Integer.toString(iMax))); ! saveErrors(request, errors); ! valid = false; ! } ! if(!ectValidation.minLength(iMin, inputValue)){ ! errors.add(inputValueName, new ActionError("errors.minlength", inputTypeDisplay, Integer.toString(iMin))); ! saveErrors(request, errors); ! valid = false; ! } ! if(!ectValidation.matchRegExp(regExp, inputValue)){ ! errors.add(inputValueName, ! new ActionError("errors.invalid", inputTypeDisplay)); ! saveErrors(request, errors); ! valid = false; ! } ! if(!ectValidation.isValidBloodPressure(regExp, inputValue)){ ! errors.add(inputValueName, ! new ActionError("error.bloodPressure")); ! saveErrors(request, errors); ! valid = false; ! } ! if(iIsDate==1 && !ectValidation.isDate(inputValue)){ ! errors.add(inputValueName, ! new ActionError("errors.invalidDate", inputTypeDisplay)); ! saveErrors(request, errors); ! valid = false; ! } } if(!ectValidation.isDate(observationDate)&&inputValue.compareTo("")!=0){ *************** *** 233,239 **** db.RunSQL(sql); } ! rs.close(); ! db.CloseConn(); } } catch(SQLException e){ --- 275,281 ---- db.RunSQL(sql); } ! rs.close(); } + db.CloseConn(); } catch(SQLException e){ Index: FrmSetupFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FrmSetupFormAction.java 18 Nov 2004 21:18:19 -0000 1.2 --- FrmSetupFormAction.java 23 Nov 2004 20:10:40 -0000 1.3 *************** *** 26,29 **** --- 26,30 ---- import java.net.URL; import java.sql.ResultSet; + import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.util.Collection; *************** *** 69,77 **** FrmFormForm frm = (FrmFormForm) form; EctSessionBean bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean"); String demo = null; if (bean!=null){ request.getSession().setAttribute("EctSessionBean", bean); demo = (String) bean.getDemographicNo(); ! } String formName = (String) request.getParameter("formName"); String today = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); --- 70,81 ---- FrmFormForm frm = (FrmFormForm) form; EctSessionBean bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean"); + String formId = request.getParameter("formId"); + frm.setValue("formId", formId==null?"0":formId); String demo = null; if (bean!=null){ request.getSession().setAttribute("EctSessionBean", bean); demo = (String) bean.getDemographicNo(); ! } ! String formName = (String) request.getParameter("formName"); String today = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); *************** *** 79,88 **** request.setAttribute("today", today); request.setAttribute("drugs", drugLists); ! InputStream is = getClass().getResourceAsStream("/../../form/" + formName + ".xml"); ! try { Vector measurementTypes = EctFindMeasurementTypeUtil.checkMeasurmentTypes(is); for(int i=0; i<measurementTypes.size(); i++){ EctMeasurementTypesBean mt = (EctMeasurementTypesBean) measurementTypes.elementAt(i); //get last value and its observation date DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); --- 83,107 ---- request.setAttribute("today", today); request.setAttribute("drugs", drugLists); ! InputStream is = getClass().getResourceAsStream("/../../form/" + formName + ".xml"); ! Properties currentRec = getFormRecord(formName, formId, demo); ! try { Vector measurementTypes = EctFindMeasurementTypeUtil.checkMeasurmentTypes(is); + for(int i=0; i<measurementTypes.size(); i++){ EctMeasurementTypesBean mt = (EctMeasurementTypesBean) measurementTypes.elementAt(i); + + if(currentRec!=null){ + frm.setValue(mt.getType()+"Value", currentRec.getProperty(mt.getType()+"Value", "")); + frm.setValue(mt.getType()+"Date", currentRec.getProperty(mt.getType()+"Date", "")); + frm.setValue(mt.getType()+"Comments", currentRec.getProperty(mt.getType()+"Comments", "")); + //frm.setValue(mt.getType()+"LastData", currentRec.getProperty(mt.getType()+"LastData")); + //frm.setValue(mt.getType()+"LastDataEnteredDate", currentRec.getProperty(mt.getType()+"LastDataEnteredDate")); + //request.setAttribute(mt.getType()+"LastData", currentRec.getProperty(mt.getType()+"LastData")); + //request.setAttribute(mt.getType()+"LastDataEnteredDate", currentRec.getProperty(mt.getType()+"LastDataEnteredDate")); + } + else{ + frm.setValue(mt.getType() + "Date", today); + } //get last value and its observation date DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); *************** *** 95,102 **** request.setAttribute(mt.getType()+"LastData", mt.getLastData()); request.setAttribute(mt.getType()+"LastDataEnteredDate", mt.getLastDateEntered()); } rs.close(); db.CloseConn(); ! //System.out.println("Type: " + mt.getType() + " " + mt.getTypeDisplayName() + " " + mt.getTypeDesc()); request.setAttribute(mt.getType(), mt.getType()); request.setAttribute(mt.getType() + "Display", mt.getTypeDisplayName()); --- 114,123 ---- request.setAttribute(mt.getType()+"LastData", mt.getLastData()); request.setAttribute(mt.getType()+"LastDataEnteredDate", mt.getLastDateEntered()); + frm.setValue(mt.getType()+"LastData", mt.getLastData()); + frm.setValue(mt.getType()+"LastDataEnteredDate", mt.getLastDateEntered()); } rs.close(); db.CloseConn(); ! request.setAttribute(mt.getType(), mt.getType()); request.setAttribute(mt.getType() + "Display", mt.getTypeDisplayName()); *************** *** 104,115 **** request.setAttribute(mt.getType() + "MeasuringInstrc", mt.getMeasuringInstrc()); //request.setAttribute("value("+mt.getType() + "Date)", today); ! frm.setValue(mt.getType() + "Date", today); } } catch (SQLException e) { ! System.out.println("Error, file " + formName + ".xml not found."); ! System.out.println("This file must be placed at web/form"); } catch (Exception e) { System.out.println("Error, file " + formName + ".xml not found."); System.out.println("This file must be placed at web/form"); --- 125,136 ---- request.setAttribute(mt.getType() + "MeasuringInstrc", mt.getMeasuringInstrc()); //request.setAttribute("value("+mt.getType() + "Date)", today); ! } } catch (SQLException e) { ! e.printStackTrace(); } catch (Exception e) { + e.printStackTrace(); System.out.println("Error, file " + formName + ".xml not found."); System.out.println("This file must be placed at web/form"); *************** *** 124,128 **** } ! return (mapping.findForward("continue")); } --- 145,149 ---- } ! return (new ActionForward("/form/form"+formName+".jsp")); } *************** *** 145,147 **** --- 166,198 ---- } + private Properties getFormRecord(String formName, String formId, String demographicNo){ + Properties props = new Properties(); + try{ + + if(formId!=null){ + if(Integer.parseInt(formId)>0){ + DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); + String sql = "SELECT * FROM form" + formName + " WHERE ID='" + formId + "' AND demographic_no='" + demographicNo + "'"; + ResultSet rs = db.GetSQL(sql); + if(rs.next()) { + ResultSetMetaData md = rs.getMetaData(); + for(int i = 1; i <= md.getColumnCount(); i++) { + String name = md.getColumnName(i); + String value = rs.getString(i); + if(value != null) + props.setProperty(name, value); + } + } + } + else + return null; + } + else + return null; + } + catch(SQLException e){ + e.printStackTrace(); + } + return props; + } } |
|
From: Ivy C. <ic...@us...> - 2004-11-23 20:07:43
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12683 Removed Files: formVT.jsp Log Message: renamed formVT.jsp to formVTForm.jsp --- formVT.jsp DELETED --- |
|
From: Ivy C. <ic...@us...> - 2004-11-23 20:06:39
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12319 Added Files: formVTForm.jsp Log Message: renamed formVT.jsp to formVTForm.jsp --- NEW FILE: formVTForm.jsp --- <!-- /* * * This software is published under the GPL GNU General Public License. * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * * <OSCAR TEAM> * */ --> [...1437 lines suppressed...] <td class="MainTableBottomRowRightColumn"> </td> </tr> </table> <table class="Head" class="hidePrint" width="100%"> <tr> <td align="left"> <input type="hidden" name="submit" value="exit"/> <input type="submit" value="Save" onclick="javascript:return onSave();" /> <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> <input type="button" value="Print" onclick="javascript:return onPrint();"/> </td> </tr> </table> </html:form> </body> </html:html> |
|
From: Jay G. <jay...@us...> - 2004-11-22 16:50:19
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/oscar/oscarMDSLab/dbUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23787 Modified Files: MDSLabPool.java Log Message: code reformat Index: MDSLabPool.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/oscar/oscarMDSLab/dbUtil/MDSLabPool.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MDSLabPool.java 4 Feb 2004 16:55:25 -0000 1.1 --- MDSLabPool.java 22 Nov 2004 16:50:06 -0000 1.2 *************** *** 12,32 **** public class MDSLabPool extends ConnectionPool { ! private static MDSLabPool PoolS=null; ! ! private MDSLabPool(String driver, String url,String username, String password, ! int initialConnections,int maxConnections,boolean waitIfBusy) throws java.sql.SQLException ! { ! super(driver, url, username, password,initialConnections, maxConnections,waitIfBusy); ! } ! ! public static synchronized MDSLabPool getInstance(String driver, String url, ! String username, String password, int initialConnections, ! int maxConnections, boolean waitIfBusy) throws java.sql.SQLException ! { ! if(PoolS == null){ ! PoolS = new MDSLabPool(driver, url, username, password, ! initialConnections, maxConnections, waitIfBusy); ! } ! return(PoolS); ! } } --- 12,30 ---- public class MDSLabPool extends ConnectionPool { ! private static MDSLabPool PoolS=null; ! ! private MDSLabPool(String driver, String url,String username, String password, ! int initialConnections,int maxConnections,boolean waitIfBusy) throws java.sql.SQLException { ! super(driver, url, username, password,initialConnections, maxConnections,waitIfBusy); ! } ! ! public static synchronized MDSLabPool getInstance(String driver, String url, ! String username, String password, int initialConnections, ! int maxConnections, boolean waitIfBusy) throws java.sql.SQLException { ! if(PoolS == null){ ! PoolS = new MDSLabPool(driver, url, username, password, ! initialConnections, maxConnections, waitIfBusy); ! } ! return(PoolS); ! } } |
|
From: Jay G. <jay...@us...> - 2004-11-22 16:48:46
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23345 Modified Files: IncomingMDSFiles.java Log Message: Changed the logic for moving and changing file names Index: IncomingMDSFiles.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/IncomingMDSFiles.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IncomingMDSFiles.java 4 Feb 2004 16:55:24 -0000 1.1 --- IncomingMDSFiles.java 22 Nov 2004 16:48:33 -0000 1.2 *************** *** 150,164 **** Long lon = new Long(cal.getTimeInMillis()); String str = new String ( file.getName()+"."+lon.toString() ); ! // Destination directory ! File dir = new File(errorHL7dir); ! ! // Move file to new directory ! boolean success = file.renameTo(new File(dir, str)); if (!success) { ! // File was not successfully moved ! logger.severe(" file: "+str+" was unable to be moved to the "+errorHL7dir+" directory"); ! retval = false; ! }else{ ! logger.warning("file: "+str+" was corrupted, please examines its contents"); } return retval; --- 150,176 ---- Long lon = new Long(cal.getTimeInMillis()); String str = new String ( file.getName()+"."+lon.toString() ); ! ! File file2 = new File(str); ! boolean success = file.renameTo(file2); ! file = null; ! file2 = null; ! file = new File(str); if (!success) { ! // File was not successfully renamed ! logger.severe(" file: "+filename+" was unable to be renamed to "+str); ! retval = false; ! }else{ ! // Destination directory ! File dir = new File(errorHL7dir); ! ! // Move file to new directory ! boolean success2 = file.renameTo(new File(dir, str)); ! if (!success2) { ! // File was not successfully moved ! logger.severe(" file: "+str+" was unable to be moved to the "+errorHL7dir+" directory"); ! retval = false; ! }else{ ! logger.warning("file: "+str+" was corrupted, please examines its contents"); ! } } return retval; *************** *** 172,186 **** Long lon = new Long(cal.getTimeInMillis()); String str = new String ( file.getName()+"."+lon.toString() ); ! // Destination directory ! File dir = new File(completedHL7dir); ! ! // Move file to new directory ! boolean success = file.renameTo(new File(dir, str)); if (!success) { ! // File was not successfully moved ! logger.severe(" file: "+str+" was unable to be moved to the "+completedHL7dir+" directory"); ! retval = false; ! }else{ ! logger.info("file: "+str+" has been processed, It has been moved to the completedHL7dir"); } return retval; --- 184,210 ---- Long lon = new Long(cal.getTimeInMillis()); String str = new String ( file.getName()+"."+lon.toString() ); ! ! File file2 = new File(str); ! boolean success = file.renameTo(file2); ! file = null; ! file2 = null; ! file = new File(str); if (!success) { ! // File was not successfully renamed ! logger.severe(" file: "+file.getName()+" was unable to be renamed to "+str); ! retval = false; ! }else{ ! // Destination directory ! File dir = new File(completedHL7dir); ! ! // Move file to new directory ! boolean success2 = file.renameTo(new File(dir, str)); ! if (!success2) { ! // File was not successfully moved ! logger.severe(" file: "+str+" was unable to be moved to the "+completedHL7dir+" directory"); ! retval = false; ! }else{ ! logger.info("file: "+str+" has been processed, It has been moved to the completedHL7dir"); ! } } return retval; |
|
From: Jay G. <jay...@us...> - 2004-11-22 16:45:24
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22135 Modified Files: BulkFileParse.java Log Message: Added call to close file after processing Index: BulkFileParse.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/BulkFileParse.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BulkFileParse.java 8 Jun 2004 14:39:06 -0000 1.4 --- BulkFileParse.java 22 Nov 2004 16:45:12 -0000 1.5 *************** *** 808,811 **** --- 808,812 ---- } } + fReader.closeFile(); }catch (Exception e){ System.out.println("System caught on "+thisSegment); |
|
From: Jay G. <jay...@us...> - 2004-11-22 16:44:07
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21753 Modified Files: FileLineReader.java Log Message: added method closeFile and reformated code Index: FileLineReader.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/FileLineReader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileLineReader.java 4 Feb 2004 16:55:24 -0000 1.1 --- FileLineReader.java 22 Nov 2004 16:43:56 -0000 1.2 *************** *** 7,47 **** import java.io.*; ! public class FileLineReader ! { ! ! private BufferedReader bReader=null; ! ! ! public void openFile(String streamName) ! { ! try ! { ! bReader = new BufferedReader(new FileReader(streamName)); ! }catch (FileNotFoundException fnfe) ! { ! System.out.println(fnfe); ! } ! } ! ! ! public String getNextLine() ! { ! String thisLine=null; ! if(bReader != null) ! { ! try ! { ! thisLine = bReader.readLine(); ! }catch(Exception e) ! { ! System.out.println("Get next line error"); ! thisLine = "Sorry error getting this line"; ! } ! } ! else ! { ! System.out.println("No file had been opened"); ! } ! return thisLine; ! } } --- 7,48 ---- import java.io.*; ! public class FileLineReader { ! ! private BufferedReader bReader=null; ! ! ! public void openFile(String streamName) { ! try { ! bReader = new BufferedReader(new FileReader(streamName)); ! }catch (FileNotFoundException fnfe) { ! System.out.println(fnfe); ! } ! } ! ! ! public String getNextLine() { ! String thisLine=null; ! if(bReader != null) { ! try { ! thisLine = bReader.readLine(); ! }catch(Exception e) { ! System.out.println("Get next line error"); ! thisLine = "Sorry error getting this line"; ! } ! } ! else { ! System.out.println("No file had been opened"); ! } ! return thisLine; ! } ! ! public void closeFile(){ ! if (bReader != null){ ! try{ ! bReader.close(); ! }catch(Exception closeFileException){ ! closeFileException.printStackTrace(); ! } ! } ! } } |
|
From: Ivy C. <ic...@us...> - 2004-11-19 01:47:17
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13864 Modified Files: oscarinit.sql Log Message: assigned key to measurements, measurementType, measurementGroup and validations table Index: oscarinit.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** oscarinit.sql 14 Oct 2004 17:34:46 -0000 1.62 --- oscarinit.sql 19 Nov 2004 01:47:04 -0000 1.63 *************** *** 4922,4926 **** dateObserved datetime NOT NULL, dateEntered datetime NOT NULL, ! PRIMARY KEY(id) ) TYPE=MYISAM; --- 4922,4929 ---- dateObserved datetime NOT NULL, dateEntered datetime NOT NULL, ! PRIMARY KEY(id), ! KEY type (type), ! KEY measuringInstruction (measuringInstruction), ! KEY demographicNo (demographicNo) ) TYPE=MYISAM; *************** *** 4958,4962 **** CREATE TABLE measurementGroup( name varchar(100) NOT NULL, ! typeDisplayName varchar(20) ) TYPE =MyISAM; --- 4961,4966 ---- CREATE TABLE measurementGroup( name varchar(100) NOT NULL, ! typeDisplayName varchar(20), ! KEY name (name) ) TYPE =MyISAM; *************** *** 4984,4988 **** measuringInstruction varchar(255) NOT NULL, validation varchar(100) NOT NULL, ! PRIMARY KEY(id) ) TYPE =MyISAM; --- 4988,4995 ---- measuringInstruction varchar(255) NOT NULL, validation varchar(100) NOT NULL, ! PRIMARY KEY(id), ! KEY id (id), ! KEY type (type), ! KEY measuringInstruction (measuringInstruction) ) TYPE =MyISAM; |
|
From: Ivy C. <ic...@us...> - 2004-11-18 22:01:28
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25026 Modified Files: oscardata.sql Log Message: added Vascular Tracker to encounterForm table Index: oscardata.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscardata.sql,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** oscardata.sql 6 Aug 2004 21:30:44 -0000 1.34 --- oscardata.sql 18 Nov 2004 22:01:03 -0000 1.35 *************** *** 279,282 **** --- 279,283 ---- INSERT INTO encounterForm VALUES ('Treatment Preference', '../form/formtreatmentpref.jsp?demographic_no=','formTreatmentPref',0); INSERT INTO encounterForm VALUES ('Caregiver - SF36', '../form/formSF36caregiver.jsp?demographic_no=','formSF36Caregiver',0); + INSERT INTO encounterForm VALUES ('Vascular Tracker', ' ../form/SetupForm.do?formName=VTForm&demographic_no=','formVTForm',0); -- |
|
From: Ivy C. <ic...@us...> - 2004-11-18 21:18:40
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14700 Modified Files: formVT.jsp Log Message: added drug profile Index: formVT.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVT.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** formVT.jsp 18 Nov 2004 18:28:57 -0000 1.2 --- formVT.jsp 18 Nov 2004 21:18:31 -0000 1.3 *************** *** 1280,1283 **** --- 1280,1304 ---- </table></td> </tr> + <tr> + <th class="title" colspan="5"> + Drug Profile <a href="javascript: showHideItem('drugs');"> >> </a> + </th> + </tr> + <tr> + <td colspan="5"><table style="display:none" cellpadding='1' cellspacing='0' id="drugs"> + <tr> + <td> + <logic:present name="drugs"> + <logic:iterate id="drg" name="drugs"> + <bean:write name="drg"/><br> + </logic:iterate> + </logic:present> + <logic:notPresent name="drugs"> + No Drug in the current drug profile + </logic:notPresent> + </td> + </tr> + </td> + </tr> </td> </tr> |
|
From: Ivy C. <ic...@us...> - 2004-11-18 21:18:28
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14637 Modified Files: FrmSetupFormAction.java Log Message: added getdrugList Index: FrmSetupFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FrmSetupFormAction.java 18 Nov 2004 18:24:25 -0000 1.1 --- FrmSetupFormAction.java 18 Nov 2004 21:18:19 -0000 1.2 *************** *** 43,46 **** --- 43,47 ---- import oscar.oscarEncounter.oscarMeasurements.prop.*; import oscar.oscarEncounter.oscarMeasurements.util.*; + import oscar.oscarRx.data.*; import oscar.util.UtilDateUtilities; *************** *** 75,79 **** --- 76,82 ---- String formName = (String) request.getParameter("formName"); String today = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); + List drugLists = getDrugList(demo); request.setAttribute("today", today); + request.setAttribute("drugs", drugLists); InputStream is = getClass().getResourceAsStream("/../../form/" + formName + ".xml"); *************** *** 102,106 **** //request.setAttribute("value("+mt.getType() + "Date)", today); frm.setValue(mt.getType() + "Date", today); ! } } catch (SQLException e) { --- 105,109 ---- //request.setAttribute("value("+mt.getType() + "Date)", today); frm.setValue(mt.getType() + "Date", today); ! } } catch (SQLException e) { *************** *** 124,127 **** --- 127,147 ---- } + private List getDrugList(String demographicNo){ + RxPatientData pData = new RxPatientData(); + List drugs = new LinkedList(); + try{ + RxPatientData.Patient p = pData.getPatient(Integer.parseInt(demographicNo)); + RxPrescriptionData.Prescription[] prescribedDrugs = p.getPrescribedDrugsUnique(); + if(prescribedDrugs.length==0) + drugs=null; + for(int i=0; i<prescribedDrugs.length; i++){ + drugs.add(prescribedDrugs[i].getRxDate().toString() + " " + prescribedDrugs[i].getRxDisplay()); + } + } + catch(SQLException e){ + e.printStackTrace(); + } + return drugs; + } } |
|
From: Ivy C. <ic...@us...> - 2004-11-18 19:34:28
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20853 Modified Files: VTForm.xml Log Message: replaced "<" and ">" with escape char Index: VTForm.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/VTForm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** VTForm.xml 18 Nov 2004 19:26:30 -0000 1.2 --- VTForm.xml 18 Nov 2004 19:34:19 -0000 1.3 *************** *** 14,18 **** <typeDesc>Blood Pressure</typeDesc> <typeDisplayName>Blood Pressure</typeDisplayName> ! <measuringInstrc>Sitting Position (nnn/nnn) Target:<130/80 Interval:3mo.</measuringInstrc> <validationRule> <name>Blood Pressure</name> --- 14,18 ---- <typeDesc>Blood Pressure</typeDesc> <typeDisplayName>Blood Pressure</typeDisplayName> ! <measuringInstrc>Sitting Position (nnn/nnn) Target:<130/80 Interval:3mo.</measuringInstrc> <validationRule> <name>Blood Pressure</name> *************** *** 84,88 **** <typeDesc>HbA1c</typeDesc> <typeDisplayName>HbA1c</typeDisplayName> ! <measuringInstrc>(n.nn) Range:0.04-0.20 Target:<0.07 Interval:3-6mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0.04 to 0.2</name> --- 84,88 ---- <typeDesc>HbA1c</typeDesc> <typeDisplayName>HbA1c</typeDisplayName> ! <measuringInstrc>(n.nn) Range:0.04-0.20 Target:<0.07 Interval:3-6mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0.04 to 0.2</name> *************** *** 108,112 **** <typeDesc>Low Density Lipid</typeDesc> <typeDisplayName>LDL</typeDisplayName> ! <measuringInstrc>in mmol/L (nn.n) Range:0.5-10 Target:<2.5 Interval:6-12mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0.5 to 10</name> --- 108,112 ---- <typeDesc>Low Density Lipid</typeDesc> <typeDisplayName>LDL</typeDisplayName> ! <measuringInstrc>in mmol/L (nn.n) Range:0.5-10 Target:<2.5 Interval:6-12mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0.5 to 10</name> *************** *** 334,338 **** <typeDesc>Exercise</typeDesc> <typeDisplayName>Exercise</typeDisplayName> ! <measuringInstrc>Minutes of moderate or vigorous exercise per week (nnnn) Range:0-6720 Target:>240 Interval:3mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 6720</name> --- 334,338 ---- <typeDesc>Exercise</typeDesc> <typeDisplayName>Exercise</typeDisplayName> ! <measuringInstrc>Minutes of moderate or vigorous exercise per week (nnnn) Range:0-6720 Target:>240 Interval:3mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 6720</name> |
|
From: Ivy C. <ic...@us...> - 2004-11-18 19:26:49
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19010 Modified Files: VTForm.xml Log Message: updated measuringTypes description Index: VTForm.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/VTForm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** VTForm.xml 18 Nov 2004 18:29:47 -0000 1.1 --- VTForm.xml 18 Nov 2004 19:26:30 -0000 1.2 *************** *** 14,18 **** <typeDesc>Blood Pressure</typeDesc> <typeDisplayName>Blood Pressure</typeDisplayName> ! <measuringInstrc>Sitting Position (nnn/nnn)</measuringInstrc> <validationRule> <name>Blood Pressure</name> --- 14,18 ---- <typeDesc>Blood Pressure</typeDesc> <typeDisplayName>Blood Pressure</typeDisplayName> ! <measuringInstrc>Sitting Position (nnn/nnn) Target:<130/80 Interval:3mo.</measuringInstrc> <validationRule> <name>Blood Pressure</name> *************** *** 24,28 **** <typeDesc>Height</typeDesc> <typeDisplayName>Height</typeDisplayName> ! <measuringInstrc>in cm (0 - 300)</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 300</name> --- 24,28 ---- <typeDesc>Height</typeDesc> <typeDisplayName>Height</typeDisplayName> ! <measuringInstrc>in cm (nnn) Range:0-300 Interval:3mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 300</name> *************** *** 36,40 **** <typeDesc>Weight</typeDesc> <typeDisplayName>Weight</typeDisplayName> ! <measuringInstrc>in kg (0 - 300)</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 300</name> --- 36,40 ---- <typeDesc>Weight</typeDesc> <typeDisplayName>Weight</typeDisplayName> ! <measuringInstrc>in kg (nnn.n) Range:0-300 Interval:3mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 300</name> *************** *** 48,52 **** <typeDesc>Waist Circumference</typeDesc> <typeDisplayName>Waist Circumference</typeDisplayName> ! <measuringInstrc>in cm (40 - 500)</measuringInstrc> <validationRule> <name>Numeric Value: 40 to 500</name> --- 48,52 ---- <typeDesc>Waist Circumference</typeDesc> <typeDisplayName>Waist Circumference</typeDisplayName> ! <measuringInstrc>in cm (nnn) Range:40-500 Interval:3mo.</measuringInstrc> <validationRule> <name>Numeric Value: 40 to 500</name> *************** *** 60,64 **** <typeDesc>Hip Circumference</typeDesc> <typeDisplayName>Hip Circumference</typeDisplayName> ! <measuringInstrc>in cm (40 - 700)</measuringInstrc> <validationRule> <name>Numeric Value: 40 to 700</name> --- 60,64 ---- <typeDesc>Hip Circumference</typeDesc> <typeDisplayName>Hip Circumference</typeDisplayName> ! <measuringInstrc>in cm (nnn) Range:40-700 Interval:3mo.</measuringInstrc> <validationRule> <name>Numeric Value: 40 to 700</name> *************** *** 72,76 **** <typeDesc>Heart Rate</typeDesc> <typeDisplayName>Heart Rate</typeDisplayName> ! <measuringInstrc>in bpm (40 - 180)</measuringInstrc> <validationRule> <name>Numeric Value: 40 to 180</name> --- 72,76 ---- <typeDesc>Heart Rate</typeDesc> <typeDisplayName>Heart Rate</typeDisplayName> ! <measuringInstrc>in bpm (nnn) Range:40-180</measuringInstrc> <validationRule> <name>Numeric Value: 40 to 180</name> *************** *** 84,88 **** <typeDesc>HbA1c</typeDesc> <typeDisplayName>HbA1c</typeDisplayName> ! <measuringInstrc>(0.04 - 0.2)</measuringInstrc> <validationRule> <name>Numeric Value: 0.04 to 0.2</name> --- 84,88 ---- <typeDesc>HbA1c</typeDesc> <typeDisplayName>HbA1c</typeDisplayName> ! <measuringInstrc>(n.nn) Range:0.04-0.20 Target:<0.07 Interval:3-6mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0.04 to 0.2</name> *************** *** 96,100 **** <typeDesc>Blood Glucose</typeDesc> <typeDisplayName>Blood Glucose</typeDisplayName> ! <measuringInstrc>in mmol/L (1.5 - 30.0)</measuringInstrc> <validationRule> <name>Numeric Value: 1.5 to 30.0</name> --- 96,100 ---- <typeDesc>Blood Glucose</typeDesc> <typeDisplayName>Blood Glucose</typeDisplayName> ! <measuringInstrc>in mmol/L (nn.n) Range:1.5-30.0</measuringInstrc> <validationRule> <name>Numeric Value: 1.5 to 30.0</name> *************** *** 108,112 **** <typeDesc>Low Density Lipid</typeDesc> <typeDisplayName>LDL</typeDisplayName> ! <measuringInstrc>in mmol/L (0.5 - 10)</measuringInstrc> <validationRule> <name>Numeric Value: 0.5 to 10</name> --- 108,112 ---- <typeDesc>Low Density Lipid</typeDesc> <typeDisplayName>LDL</typeDisplayName> ! <measuringInstrc>in mmol/L (nn.n) Range:0.5-10 Target:<2.5 Interval:6-12mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0.5 to 10</name> *************** *** 120,124 **** <typeDesc>High Density Lipid</typeDesc> <typeDisplayName>HDL</typeDisplayName> ! <measuringInstrc>in mmol/L (0.4 - 4.0)</measuringInstrc> <validationRule> <name>Numeric Value: 0.4 to 4.0</name> --- 120,124 ---- <typeDesc>High Density Lipid</typeDesc> <typeDisplayName>HDL</typeDisplayName> ! <measuringInstrc>in mmol/L (n.n) Range:0.4-4.0</measuringInstrc> <validationRule> <name>Numeric Value: 0.4 to 4.0</name> *************** *** 132,136 **** <typeDesc>Total Cholestorol</typeDesc> <typeDisplayName>Total Cholestorol</typeDisplayName> ! <measuringInstrc>in mmol/L (2.0 - 12.0)</measuringInstrc> <validationRule> <name>Numeric Value: 2.0 to 12.0</name> --- 132,136 ---- <typeDesc>Total Cholestorol</typeDesc> <typeDisplayName>Total Cholestorol</typeDisplayName> ! <measuringInstrc>in mmol/L (nn.n) Range:2.0-12.0</measuringInstrc> <validationRule> <name>Numeric Value: 2.0 to 12.0</name> *************** *** 144,148 **** <typeDesc>Triglycerides</typeDesc> <typeDisplayName>Triglycerides</typeDisplayName> ! <measuringInstrc>in mmol/L (0.0 - 35.0)</measuringInstrc> <validationRule> <name>Numeric Value: 0.0 to 35.0</name> --- 144,148 ---- <typeDesc>Triglycerides</typeDesc> <typeDisplayName>Triglycerides</typeDisplayName> ! <measuringInstrc>in mmol/L (nn.n) Range:0.0-35.0</measuringInstrc> <validationRule> <name>Numeric Value: 0.0 to 35.0</name> *************** *** 156,160 **** <typeDesc>Urine alb: creat ratio</typeDesc> <typeDisplayName>Urine alb: creat ratio</typeDisplayName> ! <measuringInstrc>in mg/mmol (0 - 100)</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 100</name> --- 156,160 ---- <typeDesc>Urine alb: creat ratio</typeDesc> <typeDisplayName>Urine alb: creat ratio</typeDisplayName> ! <measuringInstrc>in mg/mmol (nnn.n) Rnage:0-100 Interval:12mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 100</name> *************** *** 168,172 **** <typeDesc>24 hour urine albumin</typeDesc> <typeDisplayName>24 hour urine albumin</typeDisplayName> ! <measuringInstrc>mg/24h (0 - 500)</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 500</name> --- 168,172 ---- <typeDesc>24 hour urine albumin</typeDesc> <typeDisplayName>24 hour urine albumin</typeDisplayName> ! <measuringInstrc>mg/24h (nnn.n) Range:0-500 Interval:12mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 500</name> *************** *** 179,183 **** <type>FTNo</type> <typeDesc>No Significan Pathology</typeDesc> ! <typeDisplayName>Foot Exam: No Significan Pathology</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> --- 179,183 ---- <type>FTNo</type> <typeDesc>No Significan Pathology</typeDesc> ! <typeDisplayName>Foot Exam: No Significant Pathology</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> *************** *** 300,304 **** <typeDesc>Cigarette Smoking Status</typeDesc> <typeDisplayName>Cigarette Smoking Status</typeDisplayName> ! <measuringInstrc>Average cigarettes per day (0 - 80)</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 80</name> --- 300,304 ---- <typeDesc>Cigarette Smoking Status</typeDesc> <typeDisplayName>Cigarette Smoking Status</typeDisplayName> ! <measuringInstrc>Average cigarettes per day (nn) Range:0-80</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 80</name> *************** *** 312,316 **** <typeDesc>Cigarette Smoking History</typeDesc> <typeDisplayName>Cigarette Smoking Status</typeDisplayName> ! <measuringInstrc>Cumulative pack years (0 - 150)</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 150</name> --- 312,316 ---- <typeDesc>Cigarette Smoking History</typeDesc> <typeDisplayName>Cigarette Smoking Status</typeDisplayName> ! <measuringInstrc>Cumulative pack years (nnn) Range:0-150</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 150</name> *************** *** 334,338 **** <typeDesc>Exercise</typeDesc> <typeDisplayName>Exercise</typeDisplayName> ! <measuringInstrc>Minutes of moderate or vigorous exercise per week (0 - 6720)</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 6720</name> --- 334,338 ---- <typeDesc>Exercise</typeDesc> <typeDisplayName>Exercise</typeDisplayName> ! <measuringInstrc>Minutes of moderate or vigorous exercise per week (nnnn) Range:0-6720 Target:>240 Interval:3mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 6720</name> *************** *** 346,350 **** <typeDesc>Diet</typeDesc> <typeDisplayName>Diet</typeDisplayName> ! <measuringInstrc>Servings of fruits and vegetables per day (0 - 20)</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 20</name> --- 346,350 ---- <typeDesc>Diet</typeDesc> <typeDisplayName>Diet</typeDisplayName> ! <measuringInstrc>Servings of fruits and vegetables per day (nn) Range:0-20 Interval:3mo.</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 20</name> |
|
From: Jay G. <jay...@us...> - 2004-11-18 18:35:01
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/immunization/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6091 Modified Files: AdministrateImmunizationSets.jsp Log Message: Reformat Index: AdministrateImmunizationSets.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/immunization/config/AdministrateImmunizationSets.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AdministrateImmunizationSets.jsp 10 Aug 2004 15:31:32 -0000 1.4 --- AdministrateImmunizationSets.jsp 18 Nov 2004 18:34:48 -0000 1.5 *************** *** 146,204 **** </td> <td class="MainTableRightColumn"> ! <table width="50%" border=0 cellspacing=1> ! <html:form action="/oscarEncounter/immunization/config/deleteImmunizationSet"> ! ! <tr> ! <th></th> ! <th><font color="red"><%=deletedList?"(Deleted)":""%></font> <bean:message key="oscarEncounter.immunization.config.administrativeImmunizationSets.msgImmName"/> ! </th> ! <th> <bean:message key="oscarEncounter.immunization.config.administrativeImmunizationSets.msgDateCreated"/> ! </th> ! </tr> ! <%for ( int i = 0; i < immuSets.setNameVec.size();i++){ ! String name = (String) immuSets.setNameVec.elementAt(i); ! String id = (String) immuSets.setIdVec.elementAt(i); String createDate = (String) immuSets.createDateVec.elementAt(i); ! %> ! <tr bgcolor="<%= i%2==0? "#EEEEFF" : "#CCCCFF"%>"> ! <td width="3%"><input type="checkbox" name="chkSetId" value="<%=id%>" /> ! </td> ! <td width="70%"> ! ! <a href="javascript:popupImmunizationSet(768,1024,'ImmunizationSetDisplay.do?setId=<%=id%>')"> ! <%=name%> ! </a> ! </td> ! <td align="center" > ! <%=createDate%> ! </td> ! </tr> ! <%}%> ! </table> ! <br/> ! <table width="50%" border=0 cellspacing=1> ! <tr> ! <td> ! <% if (deletedList == true) { %> ! <input type="submit" name="action" value="<bean:message key="oscarEncounter.immunization.config.administrativeImmunizationSets.btnRestore"/>"> ! <% } else { %> ! <input type="submit" name="action" value="<bean:message key="oscarEncounter.immunization.config.administrativeImmunizationSets.btnDelete"/>"> ! <% } %> ! </td> ! <td align="right"> ! <input type="button" name="Button" value="<bean:message key="oscarEncounter.immunization.config.administrativeImmunizationSets.btnAddNew"/>" onClick="javascript:goURL('CreateImmunizationSetInit.jsp');"> ! <% if (deletedList == true) { %> ! <input type="button" name="action" value="<bean:message key="oscarEncounter.immunization.config.administrativeImmunizationSets.btnSetlist"/>" onClick="goURL('AdministrateImmunizationSets.jsp');"> ! <% } else { %> ! <input type="button" name="action" value="<bean:message key="oscarEncounter.immunization.config.administrativeImmunizationSets.btnDelList"/>" onClick="goURL('AdministrateImmunizationSets.jsp?stat=2');"> ! <% } %> ! </td> ! </tr> ! </html:form> ! ! </table> </td> </tr> --- 146,201 ---- </td> <td class="MainTableRightColumn"> ! <html:form action="/oscarEncounter/immunization/config/deleteImmunizationSet"> ! <table width="50%" border=0 cellspacing=1> ! <tr> ! <th> </th> ! <th><font color="red"><%=deletedList?"(Deleted)":""%></font> <bean:message key="oscarEncounter.immunization.config.administrativeImmunizationSets.msgImmName"/> ! </th> ! <th> <bean:message key="oscarEncounter.immunization.config.administrativeImmunizationSets.msgDateCreated"/> ! </th> ! </tr> ! <%for ( int i = 0; i < immuSets.setNameVec.size();i++){ ! String name = (String) immuSets.setNameVec.elementAt(i); ! String id = (String) immuSets.setIdVec.elementAt(i); String createDate = (String) immuSets.createDateVec.elementAt(i); ! %> ! <tr bgcolor="<%= i%2==0? "#EEEEFF" : "#CCCCFF"%>"> ! <td width="3%"><input type="checkbox" name="chkSetId" value="<%=id%>" /> ! </td> ! <td width="70%"> ! <a href="javascript:popupImmunizationSet(768,1024,'ImmunizationSetDisplay.do?setId=<%=id%>')"> ! <%=name%> ! </a> ! </td> ! <td align="center" > ! <%=createDate%> ! </td> ! </tr> ! <%}%> ! </table> ! <br/> ! <table width="50%" border=0 cellspacing=1> ! <tr> ! <td> ! <% if (deletedList == true) { %> ! <input type="submit" name="action" value="<bean:message key="oscarEncounter.immunization.config.administrativeImmunizationSets.btnRestore"/>"> ! <% } else { %> ! <input type="submit" name="action" value="<bean:message key="oscarEncounter.immunization.config.administrativeImmunizationSets.btnDelete"/>"> ! <% } %> ! </td> ! <td align="right"> ! <input type="button" name="Button" value="<bean:message key="oscarEncounter.immunization.config.administrativeImmunizationSets.btnAddNew"/>" onClick="javascript:goURL('CreateImmunizationSetInit.jsp');"> ! <% if (deletedList == true) { %> ! <input type="button" name="action" value="<bean:message key="oscarEncounter.immunization.config.administrativeImmunizationSets.btnSetlist"/>" onClick="goURL('AdministrateImmunizationSets.jsp');"> ! <% } else { %> ! <input type="button" name="action" value="<bean:message key="oscarEncounter.immunization.config.administrativeImmunizationSets.btnDelList"/>" onClick="goURL('AdministrateImmunizationSets.jsp?stat=2');"> ! <% } %> ! </td> ! </tr> ! </table> ! </html:form> </td> </tr> |
|
From: Ivy C. <ic...@us...> - 2004-11-18 18:31:45
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5278 Modified Files: struts-config.xml Log Message: added setupForm and submitForm action Index: struts-config.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/struts-config.xml,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** struts-config.xml 30 Oct 2004 18:29:03 -0000 1.55 --- struts-config.xml 18 Nov 2004 18:31:32 -0000 1.56 *************** *** 115,118 **** --- 115,122 ---- <form-bean name="FrmForm" type="oscar.form.FrmForm"/> + + <!-- form/pageUtil start --> + <form-bean name="FrmFormForm" + type="oscar.form.pageUtil.FrmFormForm"/> <!-- oscarEncounter form bean --> *************** *** 252,259 **** type="oscar.oscarEncounter.oscarMeasurements.pageUtil.EctDeleteMeasurementStyleSheetForm"/> <form-bean name="EctAddMeasurementStyleSheetForm" ! type="oscar.oscarEncounter.oscarMeasurements.pageUtil.EctAddMeasurementStyleSheetForm"/> ! <!-- oscarmeasurements/oscarForm start --> ! <form-bean name="EctVTFormForm" ! type="oscar.oscarEncounter.oscarMeasurements.oscarForm.pageUtil.EctVTFormForm"/> --- 256,260 ---- type="oscar.oscarEncounter.oscarMeasurements.pageUtil.EctDeleteMeasurementStyleSheetForm"/> <form-bean name="EctAddMeasurementStyleSheetForm" ! type="oscar.oscarEncounter.oscarMeasurements.pageUtil.EctAddMeasurementStyleSheetForm"/> *************** *** 746,749 **** --- 747,764 ---- <forward name="failure" path="/oscarEncounter/error.jsp" /> </action> + + <action path="/form/SetupForm" + type="oscar.form.pageUtil.FrmSetupFormAction" + name="FrmFormForm" + scope="request"> + <forward name="continue" path="/form/formVT.jsp"/> + </action> + <action path="/form/SubmitForm" + type="oscar.form.pageUtil.FrmFormAction" + name="FrmFormForm" + scope="request"> + <forward name="success" path="/form/formVT2OSDSF.jsp"/> + <forward name="failure" path="/form/formVT.jsp" /> + </action> <!-- Edit oscarEncounter --> *************** *** 1257,1275 **** </action> ! <!--start oscarmeasurements/oscarForm actions --> ! <action path="/oscarEncounter/oscarMeasurements/oscarForm/SetupVTForm" ! type="oscar.oscarEncounter.oscarMeasurements.oscarForm.pageUtil.EctSetupVTFormAction" ! name="EctVTFormForm" ! scope="request"> ! <forward name="continue" path="/form/formVT.jsp"/> ! </action> ! <action path="/oscarEncounter/oscarMeasurements/oscarForm/VTForm" ! type="oscar.oscarEncounter.oscarMeasurements.oscarForm.pageUtil.EctVTFormAction" ! name="EctVTFormForm" ! input="/form/formVT.jsp" ! scope="request"> ! <forward name="success" path="/form/formVT2OSDSF.jsp"/> ! </action> ! <!-- end oscarmeasurements/oscarForm actions --> <!-- end measurements actions--> --- 1272,1276 ---- </action> ! <!-- end measurements actions--> |
|
From: Ivy C. <ic...@us...> - 2004-11-18 18:29:56
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4869 Added Files: VTForm.xml VTForm.properties Log Message: initial commit --- NEW FILE: VTForm.properties --- # Sample ResourceBundle properties file demographic_no=patient_cod visitDate =visit_cod HTValue=int_Height_cm HTDate=int_Height_cm_date WTValue=dbl_Weight_kg WTDate=dbl_Weight_kg_date WCValue=int_WaistCircumference_cm WCDate=int_WaistCircumference_cm_date HCValue=int_HipCircumference_cm HCDate=int_HipCircumference_cm_date SBPValue=int_SBP_mmHg SBPDate=int_SBP_mmHg_date DBPValue=int_DBP_mmHg DBPDate=int_DBP_mmHg_date HRValue=int_Pulse_bpm HRDate=int_Pulse_bpm_date HbA1Value=dbl_HbA1c HbA1Date=dbl_HbA1c_date BGValue=dbl_Glucose_mM BGDate=dbl_Glucose_mM_date LDLValue=dbl_LDL_mM LDLDate=dbl_LDL_mM_date HDLValue=dbl_HDL_mM HDLDate=dbl_HDL_mM_date TCHLValue=dbl_TotalCholesterol_mM TCHLDate=dbl_TotalCholesterol_mM_date TRIGValue=dbl_Triglycerides_mM TRIGDate=dbl_Triglycerides_mM_date UALBValue=dbl_UrineAlbuminCreatinineRation_mgPermmol UALBDate=dbl_UrineAlbuminCreatinineRation_mgPermmol_date 24UAValue=dbl_UrineAlbumin_mgPerDay 24UADate=dbl_UrineAlbumin_mgPerDay_date --- NEW FILE: VTForm.xml --- <?xml version="1.0" encoding="UTF-8"?> <!-- Document : VTForm.xml Created on : October 31, 2004, 1:46 PM Author : root Description: Purpose of the document follows. --> <formProp> <measurement> <type>BP</type> <typeDesc>Blood Pressure</typeDesc> <typeDisplayName>Blood Pressure</typeDisplayName> <measuringInstrc>Sitting Position (nnn/nnn)</measuringInstrc> <validationRule> <name>Blood Pressure</name> <regularExp>[0-9]{2,3}/{1}[0-9]{2,3}</regularExp> </validationRule> </measurement> <measurement> <type>HT</type> <typeDesc>Height</typeDesc> <typeDisplayName>Height</typeDisplayName> <measuringInstrc>in cm (0 - 300)</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 300</name> <minValue>0</minValue> <maxValue>300</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>WT</type> <typeDesc>Weight</typeDesc> <typeDisplayName>Weight</typeDisplayName> <measuringInstrc>in kg (0 - 300)</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 300</name> <minValue>0</minValue> <maxValue>300</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>WC</type> <typeDesc>Waist Circumference</typeDesc> <typeDisplayName>Waist Circumference</typeDisplayName> <measuringInstrc>in cm (40 - 500)</measuringInstrc> <validationRule> <name>Numeric Value: 40 to 500</name> <minValue>40</minValue> <maxValue>500</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>HC</type> <typeDesc>Hip Circumference</typeDesc> <typeDisplayName>Hip Circumference</typeDisplayName> <measuringInstrc>in cm (40 - 700)</measuringInstrc> <validationRule> <name>Numeric Value: 40 to 700</name> <minValue>40</minValue> <maxValue>700</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>HR</type> <typeDesc>Heart Rate</typeDesc> <typeDisplayName>Heart Rate</typeDisplayName> <measuringInstrc>in bpm (40 - 180)</measuringInstrc> <validationRule> <name>Numeric Value: 40 to 180</name> <minValue>40</minValue> <maxValue>180</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>HbA1</type> <typeDesc>HbA1c</typeDesc> <typeDisplayName>HbA1c</typeDisplayName> <measuringInstrc>(0.04 - 0.2)</measuringInstrc> <validationRule> <name>Numeric Value: 0.04 to 0.2</name> <minValue>0.04</minValue> <maxValue>0.2</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>BG</type> <typeDesc>Blood Glucose</typeDesc> <typeDisplayName>Blood Glucose</typeDisplayName> <measuringInstrc>in mmol/L (1.5 - 30.0)</measuringInstrc> <validationRule> <name>Numeric Value: 1.5 to 30.0</name> <minValue>1.5</minValue> <maxValue>30.0</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>LDL</type> <typeDesc>Low Density Lipid</typeDesc> <typeDisplayName>LDL</typeDisplayName> <measuringInstrc>in mmol/L (0.5 - 10)</measuringInstrc> <validationRule> <name>Numeric Value: 0.5 to 10</name> <minValue>0.5</minValue> <maxValue>10</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>HDL</type> <typeDesc>High Density Lipid</typeDesc> <typeDisplayName>HDL</typeDisplayName> <measuringInstrc>in mmol/L (0.4 - 4.0)</measuringInstrc> <validationRule> <name>Numeric Value: 0.4 to 4.0</name> <minValue>0.4</minValue> <maxValue>4.0</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>TCHL</type> <typeDesc>Total Cholestorol</typeDesc> <typeDisplayName>Total Cholestorol</typeDisplayName> <measuringInstrc>in mmol/L (2.0 - 12.0)</measuringInstrc> <validationRule> <name>Numeric Value: 2.0 to 12.0</name> <minValue>2.0</minValue> <maxValue>12.0</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>TRIG</type> <typeDesc>Triglycerides</typeDesc> <typeDisplayName>Triglycerides</typeDisplayName> <measuringInstrc>in mmol/L (0.0 - 35.0)</measuringInstrc> <validationRule> <name>Numeric Value: 0.0 to 35.0</name> <minValue>0.0</minValue> <maxValue>35.0</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>UALB</type> <typeDesc>Urine alb: creat ratio</typeDesc> <typeDisplayName>Urine alb: creat ratio</typeDisplayName> <measuringInstrc>in mg/mmol (0 - 100)</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 100</name> <minValue>0</minValue> <maxValue>100</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>24UA</type> <typeDesc>24 hour urine albumin</typeDesc> <typeDisplayName>24 hour urine albumin</typeDisplayName> <measuringInstrc>mg/24h (0 - 500)</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 500</name> <minValue>0</minValue> <maxValue>500</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>FTNo</type> <typeDesc>No Significan Pathology</typeDesc> <typeDisplayName>Foot Exam: No Significan Pathology</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>FTNe</type> <typeDesc>Neuropathy</typeDesc> <typeDisplayName>Foot Exam: Neuropathy</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>FTIs</type> <typeDesc>Ischemia</typeDesc> <typeDisplayName>Foot Exam: Ischemia</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>FTUl</type> <typeDesc>Ulcer</typeDesc> <typeDisplayName>Foot Exam: Ulcer</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>FTIn</type> <typeDesc>Infection</typeDesc> <typeDisplayName>Foot Exam: Infection</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>FTOt</type> <typeDesc>Other Vascular abnomality</typeDesc> <typeDisplayName>Foot Exam: Other Vascular abnomality</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>FTRe</type> <typeDesc>Referral made</typeDesc> <typeDisplayName>Foot Exam: Referral made</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>iNo</type> <typeDesc>No Significant Pathology</typeDesc> <typeDisplayName>Eye Exam: No Significant Pathology</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>iDia</type> <typeDesc>Diabetic Retinopathy</typeDesc> <typeDisplayName>Eye Exam: Diabetic Retinopathy</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>iHyp</type> <typeDesc>Hypertensive Retinopathy</typeDesc> <typeDisplayName>Eye Exam: Hypertensive Retinopathy</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>iOth</type> <typeDesc>Other Vascular Abnormality</typeDesc> <typeDisplayName>Eye Exam: Other Vascular Abnomality</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>iRef</type> <typeDesc>Refferal Made</typeDesc> <typeDisplayName>Eye Exam: Refferal Made</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>SmkS</type> <typeDesc>Cigarette Smoking Status</typeDesc> <typeDisplayName>Cigarette Smoking Status</typeDisplayName> <measuringInstrc>Average cigarettes per day (0 - 80)</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 80</name> <minValue>0</minValue> <maxValue>80</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>SmkH</type> <typeDesc>Cigarette Smoking History</typeDesc> <typeDisplayName>Cigarette Smoking Status</typeDisplayName> <measuringInstrc>Cumulative pack years (0 - 150)</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 150</name> <minValue>0</minValue> <maxValue>150</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>SmkC</type> <typeDesc>Cigarette Smoking Cessation</typeDesc> <typeDisplayName>Cigarette Smoking Cessation</typeDisplayName> <measuringInstrc>Date last quit (yyyy-MM-dd)</measuringInstrc> <validationRule> <name>Date</name> <isDate>1</isDate> </validationRule> </measurement> <measurement> <type>Exer</type> <typeDesc>Exercise</typeDesc> <typeDisplayName>Exercise</typeDisplayName> <measuringInstrc>Minutes of moderate or vigorous exercise per week (0 - 6720)</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 6720</name> <minValue>0</minValue> <maxValue>6720</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>Diet</type> <typeDesc>Diet</typeDesc> <typeDisplayName>Diet</typeDisplayName> <measuringInstrc>Servings of fruits and vegetables per day (0 - 20)</measuringInstrc> <validationRule> <name>Numeric Value: 0 to 20</name> <minValue>0</minValue> <maxValue>20</maxValue> <isNumeric>1</isNumeric> </validationRule> </measurement> <measurement> <type>DpSc</type> <typeDesc>Depression Screen</typeDesc> <typeDisplayName>Depression Screen</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>StSc</type> <typeDesc>Stress Screen</typeDesc> <typeDisplayName>Stress Screen</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>LcCt</type> <typeDesc>Locus of Control Screen</typeDesc> <typeDisplayName>Locus of Control Screen</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>MedG</type> <typeDesc>Medication adherence general problem</typeDesc> <typeDisplayName>Medication adherence general problem</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>MedN</type> <typeDesc>Medication adherence negative beliefs</typeDesc> <typeDisplayName>Medication adherence negative beliefs</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>MedR</type> <typeDesc>Medication adherence recall barriers</typeDesc> <typeDisplayName>Medication adherence recall barriers</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>MedA</type> <typeDesc>Medication adherence access barriers</typeDesc> <typeDisplayName>Medication adherence access barriers</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>NtrC</type> <typeDesc>Diet/Nutrition Counseling Given</typeDesc> <typeDisplayName>Diet/Nutrition Counseling Given</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>ExeC</type> <typeDesc>Exercise Counseling Given</typeDesc> <typeDisplayName>Exercise Counseling Given</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>SmCC</type> <typeDesc>Smoking Cessation Counseling Given</typeDesc> <typeDisplayName>Smoking Cessation Counseling Given</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>DiaC</type> <typeDesc>Diabetes Counseling Given</typeDesc> <typeDisplayName>Diabetes Counseling Given</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>PsyC</type> <typeDesc>Psychosocial Counseling Given</typeDesc> <typeDisplayName>Psychosocial Counseling Given</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> <measurement> <type>OthC</type> <typeDesc>Other Counseling Given</typeDesc> <typeDisplayName>Other Counseling Given</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> <name>Yes/No</name> <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> </measurement> </formProp> |
|
From: Ivy C. <ic...@us...> - 2004-11-18 18:29:06
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4663 Modified Files: formVT.jsp Log Message: customized the form to have an unique view Index: formVT.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVT.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** formVT.jsp 18 Oct 2004 22:57:12 -0000 1.1 --- formVT.jsp 18 Nov 2004 18:28:57 -0000 1.2 *************** *** 2,6 **** /* * - * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * * This software is published under the GPL GNU General Public License. * This program is free software; you can redistribute it and/or --- 2,5 ---- *************** *** 17,25 **** * <OSCAR TEAM> * [...1378 lines suppressed...] ! <td class="dataEntryTable"><bean:write name="OthCDesc"/></td> ! <td class="dataEntryTable" align="center"> ! <logic:present name="OthCLastData"> ! <table cellpadding='0' cellspacing='0'> ! <tr><td class="eightyPercent" align="left"><bean:write name="OthCLastDataEnteredDate"/></td></tr> ! <tr><td class="eightyPercent" align="right"><bean:write name="OthCLastData"/></td></tr> ! </table> ! </logic:present> ! <logic:notPresent name="OthCLastData"> ! ! </logic:notPresent> ! </td> ! <td class="dataEntryTable" align="center"><html:checkbox property="value(OthCValue)" tabindex="6"/></td> ! <html:hidden property="value(OthCDate)"/> ! <td class="dataEntryTable" align="center"><html:text property="value(OthCComments)" size="45"/></td> ! </tr> ! </table></td> </tr> </td> </tr> |
