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-29 21:30:41
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30308 Added Files: LabProperties.properties Log Message: init commit --- NEW FILE: LabProperties.properties --- # OSCAR LAB PROPERTIES busyFile = BUSY.TXT workingFile= UPLD.TXT incomingHL7dir = ./mds incomingHL7dir = ./mds moddedTime = MODTIME.TXT errorHL7dir= ./mdsError dupsHL7dir = ./mdsDups completedHL7dir = ./mdsCompleted errorHL7dir= ./mdsError dupsHL7dir = ./mdsDups completedHL7dir = ./mdsCompleted auditLogFile = CURHST.0 #DATABASE PROPERTIES MDS_DATA = oscar_mcmaster connDriver = com.mysql.jdbc.Driver connURL = jdbc:mysql://127.0.0.1:3307/ connUser = root connPwd = **** |
|
From: Jay G. <jay...@us...> - 2004-11-29 21:21:43
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28199 Modified Files: IncomingMDSFiles.java Log Message: Added logging messages Index: IncomingMDSFiles.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/IncomingMDSFiles.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IncomingMDSFiles.java 22 Nov 2004 16:48:33 -0000 1.2 --- IncomingMDSFiles.java 29 Nov 2004 21:21:22 -0000 1.3 *************** *** 38,45 **** --- 38,47 ---- public boolean checkForBusyFile(String busyFile){ boolean exists = (new File(busyFile)).exists(); + logger.info("Checking for Busy File, busy file: "+exists ); return exists; } public boolean putWorkingFile(String workingFile){ + logger.info("Creating Working File"); boolean success = false; try { *************** *** 52,64 **** } else { // File already exists } ! } catch (IOException e) {} return success; } public boolean removeWorkingFile(String workingFile){ boolean success = (new File(workingFile)).delete(); if (!success) { // Deletion failed } return success; --- 54,71 ---- } else { // File already exists + logger.info("Working file already existed"); } ! } catch (IOException e) { ! logger.severe("Error Creating Working File "+e.getMessage()); ! } return success; } public boolean removeWorkingFile(String workingFile){ + logger.info("Removing Working File"); boolean success = (new File(workingFile)).delete(); if (!success) { // Deletion failed + logger.severe("Removing Working File failed"); } return success; *************** *** 66,69 **** --- 73,77 ---- public boolean filesToParse(String incomingHL7dir,String moddedTime){ + logger.info("Checking for Files to parse"); boolean parsingToBeDone = false; //Check when all files were modified *************** *** 77,88 **** }catch( NumberFormatException e){ logger.info("Looks to be the first time Program Runs mod file"+moddedTime+" has not been created :" ! +"so we give it the benefit of the doubnt and parse the files"); parsingToBeDone = true; } ! System.out.println("Current Modded time = "+curModdedTime+" Last Modded Time "+lastModdedTime); return parsingToBeDone; } public long getCurrentModifiedTime(String incomingHL7dir){ File file = new File(incomingHL7dir); --- 85,97 ---- }catch( NumberFormatException e){ logger.info("Looks to be the first time Program Runs mod file"+moddedTime+" has not been created :" ! +"so we give it the benefit of the doubt and parse the files"); parsingToBeDone = true; } ! logger.info("Current Modded time = "+curModdedTime+" Last Modded Time "+lastModdedTime); return parsingToBeDone; } + public long getCurrentModifiedTime(String incomingHL7dir){ File file = new File(incomingHL7dir); *************** *** 102,107 **** logger.severe(e.getMessage()); } ! ! System.out.println("this is what str is "+str); long retval = 0; --- 111,115 ---- logger.severe(e.getMessage()); } ! long retval = 0; *************** *** 123,126 **** --- 131,135 ---- public ArrayList getFileNamesToParse(String incomingHL7dir){ + logger.info("Getting Files Names to Parse"); ArrayList retval = new ArrayList(); File dir = new File(incomingHL7dir); *************** *** 129,137 **** if (children == null) { // Either dir does not exist or is not a directory } else { for (int i=0; i<children.length; i++) { // Get filename of file or directory if (!children[i].endsWith("TXT")){ ! //System.out.println("filename :"+children[i]); retval.add(children[i]); } --- 138,147 ---- if (children == null) { // Either dir does not exist or is not a directory + logger.severe("Dir "+incomingHL7dir+" does not exist or is not a directory"); } else { for (int i=0; i<children.length; i++) { // Get filename of file or directory if (!children[i].endsWith("TXT")){ ! logger.info("Adding filename :"+children[i] +" to list of files to be parsed"); retval.add(children[i]); } *************** *** 144,147 **** --- 154,158 ---- public boolean moveCorruptedFile(String filename,String errorHL7dir){ + logger.info("Moving Corrupted File: "+filename); boolean retval = true; // File (or directory) to be moved *************** *** 178,181 **** --- 189,193 ---- public boolean moveCompletedFile(String filename,String completedHL7dir){ + logger.info("Moving Completed File: "+filename); boolean retval = true; // File (or directory) to be moved |
|
From: Jay G. <jay...@us...> - 2004-11-29 21:20:52
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28002 Modified Files: IncomingLabManagement.java Log Message: Added logging messages Index: IncomingLabManagement.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/IncomingLabManagement.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IncomingLabManagement.java 29 Nov 2004 14:31:11 -0000 1.2 --- IncomingLabManagement.java 29 Nov 2004 21:20:41 -0000 1.3 *************** *** 42,46 **** // Create an appending file handler boolean append = true; ! FileHandler handler = new FileHandler("myTest.log", append); handler.setFormatter(new SimpleFormatter()); logger.setLevel(Level.ALL); --- 42,46 ---- // Create an appending file handler boolean append = true; ! FileHandler handler = new FileHandler("LabManagement.log", append); handler.setFormatter(new SimpleFormatter()); logger.setLevel(Level.ALL); *************** *** 70,74 **** } public static void main(String[] args) { ! try{ if ( args[0] == null ){ throw new Exception("Usage Exception"); } --- 70,75 ---- } public static void main(String[] args) { ! initLogger(); ! logger.info("Start "); try{ if ( args[0] == null ){ throw new Exception("Usage Exception"); } *************** *** 76,86 **** }catch(Exception loadingEx){ System.out.println("Usage: IncomingLabManagement <properties file>"); System.exit(2); } ! initLogger(); IncomingMDSFiles inMDS = new IncomingMDSFiles(); ! System.out.println("START, logging set to "+logger.getLevel()); if (!inMDS.checkForBusyFile(busyFile) ){ //CHeck for "BUSY.TXT" --- 77,88 ---- }catch(Exception loadingEx){ + logger.severe("Error loading properties file"); System.out.println("Usage: IncomingLabManagement <properties file>"); System.exit(2); } ! IncomingMDSFiles inMDS = new IncomingMDSFiles(); ! if (!inMDS.checkForBusyFile(busyFile) ){ //CHeck for "BUSY.TXT" *************** *** 95,101 **** for (int i = 0 ; i < fileNamesList.size();i++){ String filename = (String) fileNamesList.get(i); ! System.out.println("file name : "+filename); BulkFileParse bfp = new BulkFileParse(); ! logger.info("About to parse file "+filename); if(bfp.parseFile(incomingHL7dir+"/"+filename)){ --- 97,103 ---- for (int i = 0 ; i < fileNamesList.size();i++){ String filename = (String) fileNamesList.get(i); ! logger.info("About to parse file "+filename); BulkFileParse bfp = new BulkFileParse(); ! if(bfp.parseFile(incomingHL7dir+"/"+filename)){ *************** *** 111,123 **** } }catch (Exception e1){ ! logger.severe("Major Mishap"); e1.printStackTrace(); } inMDS.removeWorkingFile(incomingHL7dir+"/"+workingFile); inMDS.setLastModifiedTime(inMDS.getCurrentModifiedTime(incomingHL7dir),moddedTime); ! } ! System.out.println("END"); ! } } --- 113,125 ---- } }catch (Exception e1){ ! logger.severe("Major Mishap: "+e1.getMessage()); e1.printStackTrace(); } inMDS.removeWorkingFile(incomingHL7dir+"/"+workingFile); inMDS.setLastModifiedTime(inMDS.getCurrentModifiedTime(incomingHL7dir),moddedTime); ! } ! logger.info("END"); } + } |
|
From: Jay G. <jay...@us...> - 2004-11-29 21:14:50
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26933 Modified Files: FileLineReader.java Log Message: Added logging messages Index: FileLineReader.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/FileLineReader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileLineReader.java 22 Nov 2004 16:43:56 -0000 1.2 --- FileLineReader.java 29 Nov 2004 21:14:33 -0000 1.3 *************** *** 6,16 **** import java.io.*; public class FileLineReader { ! private BufferedReader bReader=null; public void openFile(String streamName) { try { bReader = new BufferedReader(new FileReader(streamName)); --- 6,18 ---- import java.io.*; + import java.util.logging.*; public class FileLineReader { ! Logger logger = Logger.getLogger("mdsFileManagement.FileLineReader"); private BufferedReader bReader=null; public void openFile(String streamName) { + logger.info("Opening file: "+streamName); try { bReader = new BufferedReader(new FileReader(streamName)); *************** *** 38,41 **** --- 40,44 ---- public void closeFile(){ + logger.info("Closing File"); if (bReader != null){ try{ |
|
From: Jay G. <jay...@us...> - 2004-11-29 21:14:00
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26810 Modified Files: BulkFileParse.java Log Message: Added logging messages Index: BulkFileParse.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/BulkFileParse.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BulkFileParse.java 22 Nov 2004 16:45:12 -0000 1.5 --- BulkFileParse.java 29 Nov 2004 21:13:45 -0000 1.6 *************** *** 4,7 **** --- 4,9 ---- import java.text.*; import java.io.*; + import java.util.logging.*; + /** * parses a desired MDS HL7 lab results file and stores the details *************** *** 11,14 **** --- 13,19 ---- */ public class BulkFileParse { + + Logger logger = Logger.getLogger("mdsFileManagement.BulkFileParse"); + public ArrayList aList = new ArrayList(); private FileLineReader fReader = new FileLineReader(); *************** *** 100,104 **** public void processResult(String auditLogFile,String dupsHL7dir){ ! System.out.println("Entering Proccess Result "); int insertID; for(int i=0;i<aList.size();i++){ --- 105,109 ---- public void processResult(String auditLogFile,String dupsHL7dir){ ! logger.info("Proccessing Result"); int insertID; for(int i=0;i<aList.size();i++){ *************** *** 112,116 **** patientRouteReport(insertID); } else { ! System.out.println("THOSE WERE DUPS"); Long lon = new Long(Calendar.getInstance().getTimeInMillis()); --- 117,121 ---- patientRouteReport(insertID); } else { ! logger.info("Duplicates found"); Long lon = new Long(Calendar.getInstance().getTimeInMillis()); *************** *** 258,261 **** --- 263,267 ---- public int commitFileToDB(String fileName){ + logger.info("Commiting File to Database: "+fileName); String sql = null; int insertID=0; *************** *** 345,349 **** db.CloseConn(); }catch(Exception e) { ! System.out.println("Inside the BulkFileParse::"+e); try{ if(db !=null){ --- 351,355 ---- db.CloseConn(); }catch(Exception e) { ! logger.severe("Error Inside the BulkFileParse::"+e.getMessage()); try{ if(db !=null){ *************** *** 352,356 **** } catch(Exception f){ ! System.out.println("Inside the BulkFileParse::"+f); } } --- 358,362 ---- } catch(Exception f){ ! logger.severe("Error Inside the BulkFileParse::"+f.getMessage()); } } *************** *** 386,390 **** public int commitSegmentToDB(int i){ ! System.out.println("COMMITTING SEGMENT TO DB"); String sql = null; int insertID=0; --- 392,396 ---- public int commitSegmentToDB(int i){ ! logger.info("COMMITTING SEGMENT TO DataBase"); String sql = null; int insertID=0; *************** *** 481,485 **** db.CloseConn(); }catch(Exception e){ ! System.out.println("Inside the BulkFileParse::"+e); try{ if(db !=null){ --- 487,491 ---- db.CloseConn(); }catch(Exception e){ ! logger.info("Error writing Segment to Database"); try{ if(db !=null){ *************** *** 488,492 **** } catch(Exception f){ ! System.out.println("Inside the BulkFileParse::"+f); } } --- 494,498 ---- } catch(Exception f){ ! logger.info("Error closing connection"); } } *************** *** 495,499 **** ! public boolean parseFile(String fileName){ boolean retval = true; try{ --- 501,506 ---- ! public boolean parseFile(String fileName){ ! logger.info("Parsing File "+fileName); boolean retval = true; try{ *************** *** 818,821 **** --- 825,829 ---- public void printAll() { + logger.info("Printing All to Std out"); int i = 0; int j = 0; *************** *** 959,962 **** --- 967,971 ---- public void printSegment(String title,String filename, MDSHL7Message segm){ + logger.info("Printing Segment to file :"+filename); int i = 0; int j = 0; |
|
From: Jay G. <jay...@us...> - 2004-11-29 21:13:12
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26647 Modified Files: AuditLine.java Log Message: Added logging messages Index: AuditLine.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/AuditLine.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AuditLine.java 8 Jun 2004 14:38:59 -0000 1.3 --- AuditLine.java 29 Nov 2004 21:12:58 -0000 1.4 *************** *** 7,15 **** import java.lang.reflect.*; import java.io.*; public class AuditLine { ! String delimiter = " "; char bl = ' '; --- 7,16 ---- import java.lang.reflect.*; import java.io.*; + import java.util.logging.*; public class AuditLine { ! Logger logger = Logger.getLogger("mdsFileManagement.AuditLine"); String delimiter = " "; char bl = ' '; *************** *** 17,21 **** public String getAuditLine(String procDate, String procTime, String logId,String formStatus, String formType, String accession, String hcNum, String hcVerCode, String patientName,String orderingClient,String messageDate,String messageTime){ ! --- 18,22 ---- public String getAuditLine(String procDate, String procTime, String logId,String formStatus, String formType, String accession, String hcNum, String hcVerCode, String patientName,String orderingClient,String messageDate,String messageTime){ ! logger.info("Getting Audit Line"); |
|
From: Jay G. <jay...@us...> - 2004-11-29 14:31:23
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24320 Modified Files: IncomingLabManagement.java Log Message: Change Program so it loads properties file on start up Index: IncomingLabManagement.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/IncomingLabManagement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IncomingLabManagement.java 4 Feb 2004 16:55:24 -0000 1.1 --- IncomingLabManagement.java 29 Nov 2004 14:31:11 -0000 1.2 *************** *** 9,12 **** --- 9,14 ---- import java.lang.*; import java.util.*; + import oscar.oscarMDSLab.*; + /** * *************** *** 51,56 **** } ! public static void main(String[] args) { initLogger(); --- 53,82 ---- } ! ! static void loadProperties(String filename){ ! LabProperties labProperties = LabProperties.getInstance(); ! boolean loaded = labProperties.loader(filename); ! if(!loaded){ ! System.exit(1); ! } ! busyFile = labProperties.getProperty("busyFile"); ! workingFile = labProperties.getProperty("workingFile"); ! incomingHL7dir = labProperties.getProperty("incomingHL7dir"); ! moddedTime = labProperties.getProperty("moddedTime"); ! errorHL7dir = labProperties.getProperty("errorHL7dir"); ! dupsHL7dir = labProperties.getProperty("dupsHL7dir"); ! completedHL7dir = labProperties.getProperty("completedHL7dir"); ! auditLogFile = labProperties.getProperty("auditLogFile"); ! } public static void main(String[] args) { + + try{ + if ( args[0] == null ){ throw new Exception("Usage Exception"); } + loadProperties(args[0]); + + }catch(Exception loadingEx){ + System.out.println("Usage: IncomingLabManagement <properties file>"); + System.exit(2); + } initLogger(); |
|
From: Ivy C. <ic...@us...> - 2004-11-27 23:50:27
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32105 Modified Files: FrmSetupFormAction.java Log Message: get measurement type descript from xml file all the time setattribute for date and comments of each data Index: FrmSetupFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FrmSetupFormAction.java 27 Nov 2004 17:21:49 -0000 1.4 --- FrmSetupFormAction.java 27 Nov 2004 23:50:15 -0000 1.5 *************** *** 85,98 **** request.setAttribute("drugs", drugLists); ! if(!formId.equals("0")){ ! System.out.println("formID: " + formId); ! Properties currentRec = getFormRecord(formName, formId, demo); ! Vector measurementTypes = EctFindMeasurementTypeUtil.getMeasurementsType(formName, demo); EctMeasurementTypesBean mt; for(int i=0; i<measurementTypes.size(); i++){ ! mt = (EctMeasurementTypesBean) measurementTypes.elementAt(i); ! 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", "")); request.setAttribute(mt.getType(), mt.getType()); request.setAttribute(mt.getType() + "Display", mt.getTypeDisplayName()); --- 85,100 ---- request.setAttribute("drugs", drugLists); ! ! Properties currentRec = getFormRecord(formName, formId, demo); ! ! try { ! System.out.println("formId=" + formId + "opening " + formName + ".xml"); ! InputStream is = getClass().getResourceAsStream("/../../form/" + formName + ".xml"); ! Vector measurementTypes = EctFindMeasurementTypeUtil.checkMeasurmentTypes(is, formName); EctMeasurementTypesBean mt; + + for(int i=0; i<measurementTypes.size(); i++){ ! mt = (EctMeasurementTypesBean) measurementTypes.elementAt(i); request.setAttribute(mt.getType(), mt.getType()); request.setAttribute(mt.getType() + "Display", mt.getTypeDisplayName()); *************** *** 100,177 **** request.setAttribute(mt.getType() + "MeasuringInstrc", mt.getMeasuringInstrc()); ! /*try{ ! //get last value and its observation date ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sqlData = "SELECT * FROM measurements WHERE demographicNo='"+ demo + "' AND type ='" + mt.getType() ! + "' AND measuringInstruction='" + mt.getMeasuringInstrc() + "' ORDER BY dateEntered DESC LIMIT 1"; ! ResultSet rs = db.GetSQL(sqlData); ! if(rs.next()){ ! request.setAttribute(mt.getType()+"LastData", rs.getString("dataField")); ! request.setAttribute(mt.getType()+"LastDataEnteredDate", rs.getString("dateEntered")); ! frm.setValue(mt.getType()+"LastData",rs.getString("dateEntered")); ! frm.setValue(mt.getType()+"LastDataEnteredDate",rs.getString("dateEntered")); ! } ! rs.close(); ! db.CloseConn(); ! System.out.println("Set attribute for Type: " + mt.getType() + " value: " + currentRec.getProperty(mt.getType()+"Value", "")); } - catch (SQLException e) { - e.printStackTrace(); - }*/ - } - - } - else{ - try { - System.out.println("formId=" + formId + "opening " + formName + ".xml"); - InputStream is = getClass().getResourceAsStream("/../../form/" + formName + ".xml"); - Vector measurementTypes = EctFindMeasurementTypeUtil.checkMeasurmentTypes(is, formName); - EctMeasurementTypesBean mt; - - for(int i=0; i<measurementTypes.size(); i++){ - mt = (EctMeasurementTypesBean) measurementTypes.elementAt(i); - frm.setValue(mt.getType() + "Date", today); - - /* - //get last value and its observation date - DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); - String sqlData = "SELECT * FROM measurements WHERE demographicNo='"+ demo + "' AND type ='" + mt.getType() - + "' AND measuringInstruction='" + mt.getMeasuringInstrc() + "' ORDER BY dateEntered DESC LIMIT 1"; - ResultSet rs = db.GetSQL(sqlData); - if(rs.next()){ - //mt.setLastData(rs.getString("dataField")); - //mt.setLastDateEntered(rs.getString("dateEntered")); - request.setAttribute(mt.getType()+"LastData", rs.getString("dataField")); - request.setAttribute(mt.getType()+"LastDataEnteredDate", rs.getString("dateEntered")); - frm.setValue(mt.getType()+"LastData",rs.getString("dateEntered")); - frm.setValue(mt.getType()+"LastDataEnteredDate",rs.getString("dateEntered")); - } - rs.close(); - db.CloseConn(); - */ - request.setAttribute(mt.getType(), mt.getType()); - request.setAttribute(mt.getType() + "Display", mt.getTypeDisplayName()); - request.setAttribute(mt.getType() + "Desc", mt.getTypeDesc()); - request.setAttribute(mt.getType() + "MeasuringInstrc", mt.getMeasuringInstrc()); - //request.setAttribute("value("+mt.getType() + "Date)", today); ! } ! is.close(); ! } ! /* ! catch (SQLException e) { ! e.printStackTrace(); ! } ! /*catch (Exception e) { ! e.printStackTrace(); ! } */ ! catch (IOException e) { ! System.out.println("IO error."); ! System.out.println("Error, file " + formName + ".xml not found."); ! System.out.println("This file must be placed at web/form"); ! e.printStackTrace(); ! } } ! return (new ActionForward("/form/form"+formName+".jsp")); } --- 102,149 ---- request.setAttribute(mt.getType() + "MeasuringInstrc", mt.getMeasuringInstrc()); ! 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", "")); ! request.setAttribute(mt.getType()+"Date", currentRec.getProperty(mt.getType()+"Date", "")); ! request.setAttribute(mt.getType()+"Comments", currentRec.getProperty(mt.getType()+"Comments", "")); ! } ! else{ ! frm.setValue(mt.getType() + "Date", today); } ! /* ! //get last value and its observation date ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sqlData = "SELECT * FROM measurements WHERE demographicNo='"+ demo + "' AND type ='" + mt.getType() ! + "' AND measuringInstruction='" + mt.getMeasuringInstrc() + "' ORDER BY dateEntered DESC LIMIT 1"; ! ResultSet rs = db.GetSQL(sqlData); ! if(rs.next()){ ! //mt.setLastData(rs.getString("dataField")); ! //mt.setLastDateEntered(rs.getString("dateEntered")); ! request.setAttribute(mt.getType()+"LastData", rs.getString("dataField")); ! request.setAttribute(mt.getType()+"LastDataEnteredDate", rs.getString("dateEntered")); ! frm.setValue(mt.getType()+"LastData",rs.getString("dateEntered")); ! frm.setValue(mt.getType()+"LastDataEnteredDate",rs.getString("dateEntered")); ! } ! rs.close(); ! db.CloseConn(); ! */ ! } ! is.close(); } ! /* ! catch (SQLException e) { ! e.printStackTrace(); ! } ! /*catch (Exception e) { ! e.printStackTrace(); ! } */ ! catch (IOException e) { ! System.out.println("IO error."); ! System.out.println("Error, file " + formName + ".xml not found."); ! System.out.println("This file must be placed at web/form"); ! e.printStackTrace(); ! } return (new ActionForward("/form/form"+formName+".jsp")); } |
|
From: Ivy C. <ic...@us...> - 2004-11-27 23:47:30
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31440 Added Files: formSaveAndExit.jsp Log Message: initial check in --- NEW FILE: formSaveAndExit.jsp --- <!-- /* * * 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 */ --> <% if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); %> <%@ page import="java.sql.*, java.util.*, oscar.oscarWaitingList.util.*"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <% response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 response.setHeader("Pragma","no-cache"); //HTTP 1.0 response.setDateHeader ("Expires", 0); //prevents caching at the proxy %> <html:html locale="true"> <head> <title> </title> <html:base/> </head> <link rel="stylesheet" type="text/css" href="../styles.css"> <body topmargin="0" leftmargin="0" vlink="#0000FF"> <table> <tr> <td> <script> self.close(); </script> </td> </tr> </table> </body> </html:html> |
|
From: Ivy C. <ic...@us...> - 2004-11-27 23:46:41
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31264 Modified Files: FrmFormAction.java Log Message: forward to /form/formSaveAndExit.jsp when the Save and Exit button is clicked Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FrmFormAction.java 27 Nov 2004 17:19:54 -0000 1.4 --- FrmFormAction.java 27 Nov 2004 23:46:24 -0000 1.5 *************** *** 180,184 **** //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="); --- 180,190 ---- //return mapping.findForward("success"); ! //forward to the for with updated formId ! ! String submit = request.getParameter("submit"); ! System.out.println("submit value: " + submit); ! if(submit.equalsIgnoreCase("exit")){ ! return (new ActionForward("/form/formSaveAndExit.jsp")); ! } EctFormData fData = new EctFormData(); String formNameByFormTable = fData.getFormNameByFormTable("../form/SetupForm.do?formName="+formName+"&demographic_no="); |
|
From: Ivy C. <ic...@us...> - 2004-11-27 23:44:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30789 Modified Files: formVTForm.jsp Log Message: added bean:write to FTComments and iComments textarea fixed save and saveAndExit function Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** formVTForm.jsp 23 Nov 2004 20:06:18 -0000 1.1 --- formVTForm.jsp 27 Nov 2004 23:44:27 -0000 1.2 *************** *** 160,170 **** } function onSave() { ! document.forms[0].submit.value="save"; ! //var ret = checkAllDates(); storeFTExamSupportData(); ! //if(ret==true) ! //{ var ret = confirm("Are you sure you want to save this form?"); ! //} return ret; } --- 160,168 ---- } function onSave() { ! document.forms[0].submit.value="save"; storeFTExamSupportData(); ! storeEyeExamSupportData(); var ret = confirm("Are you sure you want to save this form?"); ! return ret; } *************** *** 179,187 **** document.forms[0].submit.value="exit"; storeFTExamSupportData(); ! //var ret = checkAllDates(); ! //if(ret == true) ! //{ var ret = confirm("Are you sure you wish to save and close this window?"); ! //} return ret; } --- 177,183 ---- document.forms[0].submit.value="exit"; storeFTExamSupportData(); ! storeEyeExamSupportData(); var ret = confirm("Are you sure you wish to save and close this window?"); ! return ret; } *************** *** 200,219 **** } function storeFTExamSupportData(){ ! document.getElementById('value(FTNoDate)').value = document.getElementById('FTDate').value; ! document.getElementById('value(FTNeDate)').value = document.getElementById('FTDate').value; ! document.getElementById('value(FTIsDate)').value = document.getElementById('FTDate').value; ! document.getElementById('value(FTUlDate)').value = document.getElementById('FTDate').value; ! document.getElementById('value(FTInDate)').value = document.getElementById('FTDate').value; ! document.getElementById('value(FTOtDate)').value = document.getElementById('FTDate').value; ! document.getElementById('value(FTReDate)').value = document.getElementById('FTDate').value; ! document.getElementById('value(FTNoComments)').value = document.getElementById('FTComments').value; ! document.getElementById('value(FTNeComments)').value = document.getElementById('FTComments').value; ! document.getElementById('value(FTIsComments)').value = document.getElementById('FTComments').value; ! document.getElementById('value(FTUlComments)').value = document.getElementById('FTComments').value; ! document.getElementById('value(FTInComments)').value = document.getElementById('FTComments').value; ! document.getElementById('value(FTOtComments)').value = document.getElementById('FTComments').value; ! document.getElementById('value(FTReComments)').value = document.getElementById('FTComments').value; } --- 196,241 ---- } + function storeFTExamSupportData(){ ! //getElementbyId function doesn't work on these elements ! //here is the work around ! var e = document.forms[0].elements; ! var ftNoId, ftNeId, ftIsId, ftInId, ftUlId, ftOtId, ftReId; ! var ftNoCmt, ftNeCmt, ftIsCmt, ftInCmt, ftUlCmt, ftOtCmt, ftReCmt; ! for(i=50; i< e.length; i++){ ! switch(e[i].name){ ! case 'value(FTNoDate)': ftNoId = i; break; ! case 'value(FTNeDate)': ftNeId = i; break; ! case 'value(FTIsDate)': ftIsId = i; break; ! case 'value(FTUlDate)': ftUlId = i; break; ! case 'value(FTInDate)': ftInId = i; break; ! case 'value(FTOtDate)': ftOtId = i; break; ! case 'value(FTReDate)': ftReId = i; break; ! ! case 'value(FTNoComments)': ftNoCmt = i; break; ! case 'value(FTNeComments)': ftNeCmt = i; break; ! case 'value(FTIsComments)': ftIsCmt = i; break; ! case 'value(FTUlComments)': ftUlCmt = i; break; ! case 'value(FTInComments)': ftInCmt = i; break; ! case 'value(FTOtComments)': ftOtCmt = i; break; ! case 'value(FTReComments)': ftReCmt = i; break; ! } ! } ! ! document.forms[0].elements[ftNoId].value = document.getElementById('FTDate').value; ! document.forms[0].elements[ftNeId].value = document.getElementById('FTDate').value; ! document.forms[0].elements[ftIsId].value = document.getElementById('FTDate').value; ! document.forms[0].elements[ftUlId].value = document.getElementById('FTDate').value; ! document.forms[0].elements[ftInId].value = document.getElementById('FTDate').value; ! document.forms[0].elements[ftOtId].value = document.getElementById('FTDate').value; ! document.forms[0].elements[ftReId].value = document.getElementById('FTDate').value; ! document.forms[0].elements[ftNoCmt].value = document.forms[0].FTComments.value; ! document.forms[0].elements[ftNeCmt].value = document.forms[0].FTComments.value; ! document.forms[0].elements[ftIsCmt].value = document.forms[0].FTComments.value; ! document.forms[0].elements[ftUlCmt].value = document.forms[0].FTComments.value; ! document.forms[0].elements[ftInCmt].value = document.forms[0].FTComments.value; ! document.forms[0].elements[ftOtCmt].value = document.forms[0].FTComments.value; ! document.forms[0].elements[ftReCmt].value = document.forms[0].FTComments.value; } *************** *** 266,269 **** --- 288,327 ---- } + function storeEyeExamSupportData(){ + //getElementbyId function doesn't work on these elements + //here is the work around + var e = document.forms[0].elements; + var eyeNoId, eyeHypId, eyeDiaId, eyeOthId, eyeRefId; + var eyeNoCmt, eyeHypCmt, eyeDiaCmt, eyeOthCmt, eyeRefCmt; + for(i=50; i< e.length; i++){ + switch(e[i].name){ + case 'value(iNoDate)': eyeNoId = i; break; + case 'value(iHypDate)': eyeHypId = i; break; + case 'value(iDiaDate)': eyeDiaId = i; break; + case 'value(iOthDate)': eyeOthId = i; break; + case 'value(iRefDate)': eyeRefId = i; break; + + case 'value(iNoComments)': eyeNoCmt = i; break; + case 'value(iHypComments)': eyeHypCmt = i; break; + case 'value(iDiaComments)': eyeDiaCmt = i; break; + case 'value(iOthComments)': eyeOthCmt = i; break; + case 'value(iRefComments)': eyeRefCmt = i; break; + } + } + + document.forms[0].elements[eyeNoId].value = document.forms[0].iDate.value; + document.forms[0].elements[eyeHypId].value = document.forms[0].iDate.value; + document.forms[0].elements[eyeDiaId].value = document.forms[0].iDate.value; + document.forms[0].elements[eyeOthId].value = document.forms[0].iDate.value; + document.forms[0].elements[eyeRefId].value = document.forms[0].iDate.value; + + document.forms[0].elements[eyeNoCmt].value = document.forms[0].iComments.value; + document.forms[0].elements[eyeHypCmt].value = document.forms[0].iComments.value; + document.forms[0].elements[eyeDiaCmt].value = document.forms[0].iComments.value; + document.forms[0].elements[eyeOthCmt].value = document.forms[0].iComments.value; + document.forms[0].elements[eyeRefCmt].value = document.forms[0].iComments.value; + } + + function controlEyeExam(){ *************** *** 324,329 **** <table class="Head" class="hidePrint" width="640px" cellpadding="0" cellspacing="0"> <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();"/> --- 382,386 ---- <table class="Head" class="hidePrint" width="640px" cellpadding="0" cellspacing="0"> <tr> ! <td align="left"> <input type="submit" value="Save" onclick="javascript:return onSave();" /> <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> *************** *** 377,381 **** </td> </tr> ! <tr class="dataEntryTable"> <td class="dataEntryTable"><bean:write name="HTDesc"/><br><font class="eightyPercent"><bean:write name="HTMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> --- 434,438 ---- </td> </tr> ! <tr class="dataEntryTable"> <td class="dataEntryTable"><bean:write name="HTDesc"/><br><font class="eightyPercent"><bean:write name="HTMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> *************** *** 709,714 **** <tr class="dataEntryTable"> <th class="dataEntryTable" colspan="3">Foot Exam</th> ! <td class="dataEntryTable" valign="top" align="center"><input type="text" name="FTDate" value="<bean:write name="today"/>" size="15%" tabindex="9999"/></td> ! <td class="dataEntryTable" rowspan="8" valign="top" align="center"><textarea name="FTComments" wrap="hard" cols="20" style="height:180" tabindex="9999"></textarea></td> </tr> <tr class="dataEntryTable"> --- 766,773 ---- <tr class="dataEntryTable"> <th class="dataEntryTable" colspan="3">Foot Exam</th> ! <td class="dataEntryTable" valign="top" align="center"><input type="text" id="FTDate" name="FTDate" value="<bean:write name="today"/>" size="15%" tabindex="9999"/></td> ! <td class="dataEntryTable" rowspan="8" valign="top" align="center"> ! <textarea name="FTComments" wrap="hard" cols="20" style="height:180" tabindex="9999"><logic:present name="FTNoComments"><bean:write name="FTNoComments"/></logic:present></textarea> ! </td> </tr> <tr class="dataEntryTable"> *************** *** 877,881 **** <th class="dataEntryTable" colspan="3">Eye Exam</th> <td class="dataEntryTable" valign="top" align="center"><input type="text" name="iDate" value="<bean:write name="today"/>" size="15%"/></td> ! <td class="dataEntryTable" rowspan="8" valign="top" align="center"><textarea name="iComments" wrap="hard" cols="20" style="height:180"></textarea></td> </tr> <tr class="dataEntryTable"> --- 936,942 ---- <th class="dataEntryTable" colspan="3">Eye Exam</th> <td class="dataEntryTable" valign="top" align="center"><input type="text" name="iDate" value="<bean:write name="today"/>" size="15%"/></td> ! <td class="dataEntryTable" rowspan="8" valign="top" align="center"> ! <textarea name="iComments" wrap="hard" cols="20" style="height:180"><logic:present name="iNoComments"><bean:write name="iNoComments"/></logic:present></textarea> ! </td> </tr> <tr class="dataEntryTable"> *************** *** 1442,1446 **** </tr> </td> ! </tr> </td> </tr> --- 1503,1507 ---- </tr> </td> ! </tr> </td> </tr> *************** *** 1463,1467 **** <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();"/> --- 1524,1528 ---- <tr> <td align="left"> ! <input type="hidden" name="submit" value=""/> <input type="submit" value="Save" onclick="javascript:return onSave();" /> <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> |
|
From: Ivy C. <ic...@us...> - 2004-11-27 17:22:00
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13815 Modified Files: FrmSetupFormAction.java Log Message: get form description from the database instead of read from xml Index: FrmSetupFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FrmSetupFormAction.java 23 Nov 2004 20:10:40 -0000 1.3 --- FrmSetupFormAction.java 27 Nov 2004 17:21:49 -0000 1.4 *************** *** 65,69 **** * Add the form description to encounterForm table of the database **/ ! HttpSession session = request.getSession(true); --- 65,70 ---- * Add the form description to encounterForm table of the database **/ ! //System.gc(); ! System.out.println("SetupFormAction is called"); HttpSession session = request.getSession(true); *************** *** 83,147 **** 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); ! String sqlData = "SELECT * FROM measurements WHERE demographicNo='"+ demo + "' AND type ='" + mt.getType() ! + "' AND measuringInstruction='" + mt.getMeasuringInstrc() + "' ORDER BY dateEntered DESC LIMIT 1"; ! ResultSet rs = db.GetSQL(sqlData); ! if(rs.next()){ ! mt.setLastData(rs.getString("dataField")); ! mt.setLastDateEntered(rs.getString("dateEntered")); ! 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()); request.setAttribute(mt.getType() + "Desc", mt.getTypeDesc()); ! 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"); } ! try{ ! is.close(); ! } ! catch (IOException e) { ! System.out.println("IO error."); e.printStackTrace(); ! } return (new ActionForward("/form/form"+formName+".jsp")); --- 84,176 ---- request.setAttribute("today", today); request.setAttribute("drugs", drugLists); ! if(!formId.equals("0")){ ! System.out.println("formID: " + formId); ! Properties currentRec = getFormRecord(formName, formId, demo); ! Vector measurementTypes = EctFindMeasurementTypeUtil.getMeasurementsType(formName, demo); ! EctMeasurementTypesBean mt; for(int i=0; i<measurementTypes.size(); i++){ ! mt = (EctMeasurementTypesBean) measurementTypes.elementAt(i); ! 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", "")); request.setAttribute(mt.getType(), mt.getType()); request.setAttribute(mt.getType() + "Display", mt.getTypeDisplayName()); request.setAttribute(mt.getType() + "Desc", mt.getTypeDesc()); ! request.setAttribute(mt.getType() + "MeasuringInstrc", mt.getMeasuringInstrc()); ! ! /*try{ ! //get last value and its observation date ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sqlData = "SELECT * FROM measurements WHERE demographicNo='"+ demo + "' AND type ='" + mt.getType() ! + "' AND measuringInstruction='" + mt.getMeasuringInstrc() + "' ORDER BY dateEntered DESC LIMIT 1"; ! ResultSet rs = db.GetSQL(sqlData); ! if(rs.next()){ ! request.setAttribute(mt.getType()+"LastData", rs.getString("dataField")); ! request.setAttribute(mt.getType()+"LastDataEnteredDate", rs.getString("dateEntered")); ! frm.setValue(mt.getType()+"LastData",rs.getString("dateEntered")); ! frm.setValue(mt.getType()+"LastDataEnteredDate",rs.getString("dateEntered")); ! } ! rs.close(); ! db.CloseConn(); ! System.out.println("Set attribute for Type: " + mt.getType() + " value: " + currentRec.getProperty(mt.getType()+"Value", "")); ! } ! catch (SQLException e) { ! e.printStackTrace(); ! }*/ ! } ! } + else{ + try { + System.out.println("formId=" + formId + "opening " + formName + ".xml"); + InputStream is = getClass().getResourceAsStream("/../../form/" + formName + ".xml"); + Vector measurementTypes = EctFindMeasurementTypeUtil.checkMeasurmentTypes(is, formName); + EctMeasurementTypesBean mt; + + for(int i=0; i<measurementTypes.size(); i++){ + mt = (EctMeasurementTypesBean) measurementTypes.elementAt(i); + frm.setValue(mt.getType() + "Date", today); + + /* + //get last value and its observation date + DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); + String sqlData = "SELECT * FROM measurements WHERE demographicNo='"+ demo + "' AND type ='" + mt.getType() + + "' AND measuringInstruction='" + mt.getMeasuringInstrc() + "' ORDER BY dateEntered DESC LIMIT 1"; + ResultSet rs = db.GetSQL(sqlData); + if(rs.next()){ + //mt.setLastData(rs.getString("dataField")); + //mt.setLastDateEntered(rs.getString("dateEntered")); + request.setAttribute(mt.getType()+"LastData", rs.getString("dataField")); + request.setAttribute(mt.getType()+"LastDataEnteredDate", rs.getString("dateEntered")); + frm.setValue(mt.getType()+"LastData",rs.getString("dateEntered")); + frm.setValue(mt.getType()+"LastDataEnteredDate",rs.getString("dateEntered")); + } + rs.close(); + db.CloseConn(); + */ + request.setAttribute(mt.getType(), mt.getType()); + request.setAttribute(mt.getType() + "Display", mt.getTypeDisplayName()); + request.setAttribute(mt.getType() + "Desc", mt.getTypeDesc()); + request.setAttribute(mt.getType() + "MeasuringInstrc", mt.getMeasuringInstrc()); + //request.setAttribute("value("+mt.getType() + "Date)", today); ! } ! is.close(); ! } ! /* ! catch (SQLException e) { e.printStackTrace(); ! } ! /*catch (Exception e) { ! e.printStackTrace(); ! } */ ! catch (IOException e) { ! System.out.println("IO error."); ! System.out.println("Error, file " + formName + ".xml not found."); ! System.out.println("This file must be placed at web/form"); ! e.printStackTrace(); ! } ! } return (new ActionForward("/form/form"+formName+".jsp")); |
|
From: Ivy C. <ic...@us...> - 2004-11-27 17:20:07
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13233 Modified Files: FrmFormAction.java Log Message: comment out get last data for each measurement type from the database Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FrmFormAction.java 23 Nov 2004 20:56:08 -0000 1.3 --- FrmFormAction.java 27 Nov 2004 17:19:54 -0000 1.4 *************** *** 72,81 **** ! System.out.println("FrmFormAction is called"); ! FrmFormForm frm = (FrmFormForm) form; ! HttpSession session = request.getSession(); ! request.getSession().setAttribute("FrmFormForm", frm); EctSessionBean bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean"); request.getSession().setAttribute("EctSessionBean", bean); --- 72,80 ---- ! System.out.println("FrmFormAction is called"); ! System.gc(); FrmFormForm frm = (FrmFormForm) form; ! HttpSession session = request.getSession(); EctSessionBean bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean"); request.getSession().setAttribute("EctSessionBean", bean); *************** *** 96,105 **** 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); String inputValue = (String) frm.getValue(mt.getType()+"Value"); String observationDate = (String) frm.getValue(mt.getType()+"Date"); --- 95,107 ---- valid = true; + EctMeasurementTypesBean mt; + EctValidationsBean validation; + //Validate each measurement long startTime = System.currentTimeMillis(); + for(int i=0; i<measurementTypes.size(); i++){ ! mt = (EctMeasurementTypesBean) measurementTypes.elementAt(i); ! validation = (EctValidationsBean) mt.getValidationRules().elementAt(0); String inputValue = (String) frm.getValue(mt.getType()+"Value"); String observationDate = (String) frm.getValue(mt.getType()+"Date"); *************** *** 111,115 **** valid = validate( inputValue, observationDate, mt, validation, request); //if(!valid) ! // System.out.println("validate each input: " + valid + " " + mt.getType() + " value:" + inputValue); } --- 113,117 ---- valid = validate( inputValue, observationDate, mt, validation, request); //if(!valid) ! System.out.println("validate each input: " + valid + " " + mt.getType() + " value:" + inputValue); } *************** *** 127,132 **** 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"); --- 129,134 ---- startTime = System.currentTimeMillis(); for(int i=0; i<measurementTypes.size(); i++){ ! mt = (EctMeasurementTypesBean) measurementTypes.elementAt(i); ! validation = (EctValidationsBean) mt.getValidationRules().elementAt(0); String type = mt.getType(); String inputValue = (String) frm.getValue(type+"Value"); |
|
From: Jay G. <jay...@us...> - 2004-11-26 20:41:53
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9578 Modified Files: EctImmSaveScheduleAction.java Log Message: Added printStackTrace to an Exception Catch Index: EctImmSaveScheduleAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil/EctImmSaveScheduleAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EctImmSaveScheduleAction.java 25 Nov 2004 05:50:01 -0000 1.5 --- EctImmSaveScheduleAction.java 26 Nov 2004 20:41:40 -0000 1.6 *************** *** 99,102 **** --- 99,103 ---- } catch(Exception ex) { + ex.printStackTrace(); throw new ServletException("Exception occurred in SaveScheduleAction", ex); } |
|
From: Jay G. <jay...@us...> - 2004-11-26 20:34:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7966 Modified Files: PatientSearch.jsp Log Message: Reformat, added method to check Strings for null or "" and replace with Index: PatientSearch.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS/PatientSearch.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PatientSearch.jsp 29 Apr 2004 17:29:46 -0000 1.2 --- PatientSearch.jsp 26 Nov 2004 20:34:35 -0000 1.3 *************** *** 1,2 **** --- 1,25 ---- + <%@ page import="java.util.*, java.sql.*,java.net.*, oscar.oscarDB.DBPreparedHandler, oscar.MyDateFormat, oscar.Misc" %> + <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> + <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> + <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> + <% + + // Apologies for the crap code. Definitely could do with a major rewrite... + + if(session.getValue("user") == null) response.sendRedirect("../logout.jsp"); + // String curProvider_no = (String) session.getAttribute("user"); + String curProvider_no = request.getParameter("provider_no"); + String strLimit1="0"; + String strLimit2="10"; + StringBuffer bufChart = null, bufName = null, bufNo = null; + if(request.getParameter("limit1")!=null) strLimit1 = request.getParameter("limit1"); + if(request.getParameter("limit2")!=null) strLimit2 = request.getParameter("limit2"); + %> + + + <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" /> + <jsp:useBean id="providerBean" class="java.util.Properties" scope="session" /> + + <!-- /* *************** *** 25,45 **** --> - <% - - // Apologies for the crap code. Definitely could do with a major rewrite... - - if(session.getValue("user") == null) response.sendRedirect("../logout.jsp"); - // String curProvider_no = (String) session.getAttribute("user"); - String curProvider_no = request.getParameter("provider_no"); - String strLimit1="0"; - String strLimit2="10"; - StringBuffer bufChart = null, bufName = null, bufNo = null; - if(request.getParameter("limit1")!=null) strLimit1 = request.getParameter("limit1"); - if(request.getParameter("limit2")!=null) strLimit2 = request.getParameter("limit2"); - %> - <%@ page import="java.util.*, java.sql.*,java.net.*, oscar.oscarDB.DBPreparedHandler, oscar.MyDateFormat, oscar.Misc" %> - <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" /> - <jsp:useBean id="providerBean" class="java.util.Properties" scope="session" /> <html> --- 48,52 ---- *************** *** 73,148 **** </head> <body background="../images/gray_bg.jpg" bgproperties="fixed" onLoad="setfocus()" topmargin="0" leftmargin="0" rightmargin="0"> ! <table border="0" cellspacing="0" cellpadding="0" width="100%" > <tr bgcolor="#486ebd"><th align=CENTER NOWRAP><font face="Helvetica" color="#FFFFFF">PATIENT MATCHING</font></th></tr> ! </table> ! <table border="0" cellpadding="1" cellspacing="0" width="100%" bgcolor="#C4D9E7"> ! <form method="post" name="titlesearch" action="PatientSearch.jsp" onSubmit="return checkTypeIn();"> ! <input type="hidden" name="labNo" value="<%=request.getParameter("labNo")%>"> ! <%--@ include file="zdemographictitlesearch.htm"--%> ! <tr valign="top"><td rowspan="2" ALIGN="right" valign="middle"> <font face="Verdana" color="#0000FF"><b><i>Search ! </i></b></font></td> ! ! <td width="10%" nowrap><font size="1" face="Verdana" color="#0000FF"> ! <input type="radio" checked name="search_mode" value="search_name"> ! <bean:message key="oscarMDS.segmentDisplay.patientSearch.formName"/></font></td> ! <td nowrap><font size="1" face="Verdana" color="#0000FF"> ! <input type="radio" name="search_mode" value="search_phone"> ! <bean:message key="oscarMDS.segmentDisplay.patientSearch.formPhone"/></font></td> ! <td nowrap><font size="1" face="Verdana" color="#0000FF"> <input type="radio" name="search_mode" value="search_dob"> ! <bean:message key="oscarMDS.segmentDisplay.patientSearch.formDOB"/></font></td> ! <td valign="middle" rowspan="2" ALIGN="left"><input type="text" NAME="keyword" SIZE="17" MAXLENGTH="100"> ! <INPUT TYPE="hidden" NAME="orderby" VALUE="last_name" > ! <INPUT TYPE="hidden" NAME="dboperation" VALUE="search_titlename" > ! <INPUT TYPE="hidden" NAME="limit1" VALUE="0" > ! <INPUT TYPE="hidden" NAME="limit2" VALUE="5" > ! <input type="hidden" name="displaymode" value="Search " > ! <input type="SUBMIT" name="displaymode" value="oscarMDS.segmentDisplay.patientSearch.btnSearch" size="17"> ! </tr><tr> ! ! <td nowrap><font size="1" face="Verdana" color="#0000FF"> ! <input type="radio" name="search_mode" value="search_address"> ! <bean:message key="oscarMDS.segmentDisplay.patientSearch.formAddress"/></font></td> ! <td nowrap><font size="1" face="Verdana" color="#0000FF"> ! <input type="radio" name="search_mode" value="search_hin"> ! <bean:message key="oscarMDS.segmentDisplay.patientSearch.formHIN"/></font></td> ! <td></td> </tr> ! </form> ! </table> ! <table width="95%" border="0"> ! <tr> ! <td align="left"><font size="-1"><i><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgResults"/></i> : <%=request.getParameter("keyword")%></font></td> ! </tr> ! </table> ! <script language="JavaScript"> ! <!-- ! var fullname=""; ! function addName(lastname, firstname, chartno) { ! fullname=lastname+","+firstname; ! document.addform.action="<%=request.getParameter("originalpage")%>?name="+fullname+"&chart_no="+chartno+"&bFirstDisp=false"; //+"\"" ; ! document.addform.submit(); // ! //return; ! } ! //--> ! </SCRIPT> ! <CENTER><table width="100%" border="1" cellpadding="0" cellspacing="1" bgcolor="#ffffff"> ! <form method="post" name="addform" action="PatientMatch.do" > ! <input type="hidden" name="labNo" value="<%=request.getParameter("labNo")%>"> ! <tr bgcolor="#339999"> ! <TH align="center" width="20%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgPatientId"/></b></TH> ! <TH align="center" width="20%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgLastName"/></b></TH> ! <TH align="center" width="20%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgFirstName"/></b></TH> ! <TH align="center" width="5%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgAge"/></b></TH> ! <TH align="center" width="10%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgRosterStatus"/></b></TH> ! <TH align="center" width="5%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgSex"/></B></TH> ! <TH align="center" width="10%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgDOB"/></B></TH> ! <TH align="center" width="10%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgDoctor"/></B></TH> ! </tr> <% --- 80,180 ---- </head> <body background="../images/gray_bg.jpg" bgproperties="fixed" onLoad="setfocus()" topmargin="0" leftmargin="0" rightmargin="0"> ! <table border="0" cellspacing="0" cellpadding="0" width="100%" > <tr bgcolor="#486ebd"><th align=CENTER NOWRAP><font face="Helvetica" color="#FFFFFF">PATIENT MATCHING</font></th></tr> ! </table> ! <table border="0" cellpadding="1" cellspacing="0" width="100%" bgcolor="#C4D9E7"> ! <form method="post" name="titlesearch" action="PatientSearch.jsp" onSubmit="return checkTypeIn();"> ! <input type="hidden" name="labNo" value="<%=request.getParameter("labNo")%>"> ! <%--@ include file="zdemographictitlesearch.htm"--%> ! <tr valign="top"> ! <td rowspan="2" ALIGN="right" valign="middle"> ! <font face="Verdana" color="#0000FF"><b><i>Search</i></b></font> ! </td> ! <td width="10%" nowrap> ! <font size="1" face="Verdana" color="#0000FF"> ! <input type="radio" checked name="search_mode" value="search_name"> ! <bean:message key="oscarMDS.segmentDisplay.patientSearch.formName"/> ! </font> ! </td> ! <td nowrap> ! <font size="1" face="Verdana" color="#0000FF"> ! <input type="radio" name="search_mode" value="search_phone"> ! <bean:message key="oscarMDS.segmentDisplay.patientSearch.formPhone"/> ! </font> ! </td> ! <td nowrap> ! <font size="1" face="Verdana" color="#0000FF"> <input type="radio" name="search_mode" value="search_dob"> ! <bean:message key="oscarMDS.segmentDisplay.patientSearch.formDOB"/> ! </font> ! </td> ! <td valign="middle" rowspan="2" ALIGN="left"> ! <input type="text" NAME="keyword" SIZE="17" MAXLENGTH="100" value="<%=request.getParameter("keyword")%>"> ! <INPUT TYPE="hidden" NAME="orderby" VALUE="last_name" > ! <INPUT TYPE="hidden" NAME="dboperation" VALUE="search_titlename" > ! <INPUT TYPE="hidden" NAME="limit1" VALUE="0" > ! <INPUT TYPE="hidden" NAME="limit2" VALUE="5" > ! <input type="hidden" name="displaymode" value="Search " > ! <input type="SUBMIT" name="displaymode" value="<bean:message key="oscarMDS.segmentDisplay.patientSearch.btnSearch"/>" size="17"> ! </td> ! </tr> ! <tr> ! <td nowrap> ! <font size="1" face="Verdana" color="#0000FF"> ! <input type="radio" name="search_mode" value="search_address"> ! <bean:message key="oscarMDS.segmentDisplay.patientSearch.formAddress"/> ! </font> ! </td> ! <td nowrap> ! <font size="1" face="Verdana" color="#0000FF"> ! <input type="radio" name="search_mode" value="search_hin"> ! <bean:message key="oscarMDS.segmentDisplay.patientSearch.formHIN"/> ! </font> ! </td> ! <td> ! ! </td> </tr> ! </form> ! </table> ! <table width="95%" border="0"> ! <tr> ! <td align="left"> ! <font size="-1"> ! <i><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgResults"/></i> : <%=request.getParameter("keyword")%> ! </font> ! </td> ! </tr> ! </table> ! <script language="JavaScript"> ! <!-- ! var fullname=""; ! function addName(lastname, firstname, chartno) { ! fullname=lastname+","+firstname; ! document.addform.action="<%=request.getParameter("originalpage")%>?name="+fullname+"&chart_no="+chartno+"&bFirstDisp=false"; //+"\"" ; ! document.addform.submit(); // ! //return; ! } ! //--> ! </SCRIPT> ! <CENTER> ! <table width="100%" border="1" cellpadding="0" cellspacing="1" bgcolor="#ffffff"> ! <form method="post" name="addform" action="PatientMatch.do" > ! <input type="hidden" name="labNo" value="<%=request.getParameter("labNo")%>"> ! <tr bgcolor="#339999"> ! <TH align="center" width="20%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgPatientId"/></b></TH> ! <TH align="center" width="20%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgLastName"/></b></TH> ! <TH align="center" width="20%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgFirstName"/></b></TH> ! <TH align="center" width="5%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgAge"/></b></TH> ! <TH align="center" width="10%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgRosterStatus"/></b></TH> ! <TH align="center" width="5%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgSex"/></B></TH> ! <TH align="center" width="10%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgDOB"/></B></TH> ! <TH align="center" width="10%"><b><bean:message key="oscarMDS.segmentDisplay.patientSearch.msgDoctor"/></B></TH> ! </tr> <% *************** *** 158,163 **** String keyword=""; ! if ( request.getParameter("keyword") != null ) { ! keyword = request.getParameter("keyword").trim(); } --- 190,195 ---- String keyword=""; ! if ( request.getParameter("keyword") != null ) { ! keyword = request.getParameter("keyword").trim(); } *************** *** 185,195 **** } ! String sql = "select demographic_no,first_name,last_name,roster_status,sex,chart_no,year_of_birth,month_of_birth,date_of_birth,provider_no from demographic where "+fieldname+ " "+regularexp+" ? " +orderby + " "+limit; ! if(request.getParameter("search_mode").equals("search_name")) { keyword=keyword+"%"; ! if(keyword.indexOf(",")==-1) rs = db.queryResults(sql, keyword) ; //lastname ! else if(keyword.indexOf(",")==(keyword.length()-1)) rs = db.queryResults(sql, keyword.substring(0,(keyword.length()-1)));//lastname ! else { //lastname,firstname String[] param =new String[2]; int index = keyword.indexOf(","); --- 217,231 ---- } ! String sql = "select demographic_no,first_name,last_name,roster_status,sex,chart_no,year_of_birth,month_of_birth,date_of_birth,provider_no from demographic where "+fieldname+ " "+regularexp+" ? " +orderby + " "+limit; ! if(request.getParameter("search_mode").equals("search_name")) { keyword=keyword+"%"; ! if(keyword.indexOf(",")==-1){ ! rs = db.queryResults(sql, keyword) ; //lastname ! } ! else if(keyword.indexOf(",")==(keyword.length()-1)){ ! rs = db.queryResults(sql, keyword.substring(0,(keyword.length()-1)));//lastname ! } ! else { //lastname,firstname String[] param =new String[2]; int index = keyword.indexOf(","); *************** *** 198,203 **** //System.out.println("from -------- :"+ param[0]+ ": next :"+param[1]); rs = db.queryResults(sql, param); ! } ! } else if(request.getParameter("search_mode").equals("search_dob")) { String[] param =new String[3]; param[0]=""+MyDateFormat.getYearFromStandardDate(keyword)+"%";//(","); --- 234,239 ---- //System.out.println("from -------- :"+ param[0]+ ": next :"+param[1]); rs = db.queryResults(sql, param); ! } ! } else if(request.getParameter("search_mode").equals("search_dob")) { String[] param =new String[3]; param[0]=""+MyDateFormat.getYearFromStandardDate(keyword)+"%";//(","); *************** *** 206,210 **** //System.out.println("1111111111111111111 " +param[0]+param[1]+param[2]); rs = db.queryResults(sql, param); ! } else { keyword=keyword+"%"; rs = db.queryResults(sql, keyword); --- 242,246 ---- //System.out.println("1111111111111111111 " +param[0]+param[1]+param[2]); rs = db.queryResults(sql, param); ! } else { keyword=keyword+"%"; rs = db.queryResults(sql, keyword); *************** *** 235,248 **** %> ! <tr bgcolor="<%=bodd?"ivory":"white"%>" align="center"> ! <td><input type="submit" name="demographicNo" value="<%=rs.getString("demographic_no")%>"></td> ! <td><%=Misc.toUpperLowerCase(rs.getString("last_name"))%></td> ! <td><%=Misc.toUpperLowerCase(rs.getString("first_name"))%></td> ! <td><%=age%></td> ! <td><%=rs.getString("roster_status")%></td> ! <td><%=rs.getString("sex")%></td> ! <td><%=rs.getString("year_of_birth")+"-"+rs.getString("month_of_birth")+"-"+rs.getString("date_of_birth")%></td> ! <td><%=providerBean.getProperty(rs.getString("provider_no"))==null?"":providerBean.getProperty(rs.getString("provider_no"))%></td> ! </tr> <% bufName = new StringBuffer( (rs.getString("last_name")+ ","+ rs.getString("first_name")) ); --- 271,285 ---- %> ! <tr bgcolor="<%=bodd?"ivory":"white"%>" align="center"> ! <td><input type="submit" name="demographicNo" value="<%=rs.getString("demographic_no")%>"></td> ! <td><%=nbsp( Misc.toUpperLowerCase(rs.getString("last_name")) )%></td> ! <td><%=nbsp( Misc.toUpperLowerCase(rs.getString("first_name")) )%></td> ! <td><%= age %></td> ! <td><%=nbsp( rs.getString("roster_status") )%></td> ! <td><%=nbsp( rs.getString("sex") )%></td> ! <td><%=nbsp( rs.getString("year_of_birth")+"-"+rs.getString("month_of_birth")+"-"+rs.getString("date_of_birth") )%></td> ! <td><%=providerBean.getProperty(rs.getString("provider_no"))==null?" ":providerBean.getProperty(rs.getString("provider_no")) %></td> ! ! </tr> <% bufName = new StringBuffer( (rs.getString("last_name")+ ","+ rs.getString("first_name")) ); *************** *** 292,294 **** <bean:message key="oscarMDS.segmentDisplay.patientSearch.msgSearchMessage"/></center> </body> ! </html> \ No newline at end of file --- 329,340 ---- <bean:message key="oscarMDS.segmentDisplay.patientSearch.msgSearchMessage"/></center> </body> ! </html> ! <%! ! String nbsp(String s){ ! String ret = s; ! if (ret == null || ret.equals("")){ ! ret = " "; ! } ! return ret; ! } ! %> \ No newline at end of file |
|
From: Jay G. <jay...@us...> - 2004-11-26 20:24:27
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5847 Modified Files: MDSResultsData.java Log Message: Code Reformat Index: MDSResultsData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/data/MDSResultsData.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MDSResultsData.java 21 Jul 2004 15:14:05 -0000 1.6 --- MDSResultsData.java 26 Nov 2004 20:24:17 -0000 1.7 *************** *** 1,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 */ package oscar.oscarMDS.data; --- 1,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 */ package oscar.oscarMDS.data; *************** *** 30,248 **** ! public class MDSResultsData ! { ! public ArrayList segmentID; ! public ArrayList acknowledgedStatus; ! ! public ArrayList healthNumber; ! public ArrayList patientName; ! public ArrayList sex; ! public ArrayList resultStatus; ! public ArrayList dateTime; ! public ArrayList priority; ! public ArrayList requestingClient; ! public ArrayList discipline; ! public ArrayList reportStatus; ! ! public void populateMDSResultsData(String providerNo, String demographicNo, String patientFirstName, String patientLastName, String patientHealthNumber, String status) { ! ! if ( providerNo == null) { providerNo = ""; } ! if ( patientFirstName == null) { patientFirstName = ""; } ! if ( patientLastName == null) { patientLastName = ""; } ! if ( patientHealthNumber == null) { patientHealthNumber = ""; } ! if ( status == null ) { status = ""; } ! ! segmentID = new ArrayList(); ! acknowledgedStatus = new ArrayList(); ! ! healthNumber = new ArrayList(); ! patientName = new ArrayList(); ! sex = new ArrayList(); ! resultStatus = new ArrayList(); ! dateTime = new ArrayList(); ! priority = new ArrayList(); ! requestingClient = new ArrayList(); ! discipline = new ArrayList(); ! reportStatus = new ArrayList(); ! ! String sql = ""; ! ! try { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! if ( demographicNo == null) { // note to self: lab reports not found in the providerLabRouting table will not show up - need to ensure every lab is entered in providerLabRouting, with '0' // for the provider number if unable to find correct provider ! sql = "SELECT mdsMSH.segmentID, providerLabRouting.status, mdsPID.patientName, mdsPID.healthNumber, " + ! "mdsPID.sex, max(mdsZFR.abnormalFlag) as abnormalFlag, mdsMSH.dateTime, mdsOBR.quantityTiming, mdsPV1.refDoctor, " + ! "min(mdsZFR.reportFormStatus) as reportFormStatus, mdsZRG.reportGroupDesc " + ! "FROM mdsMSH,mdsPID,providerLabRouting,mdsPV1,mdsZFR,mdsOBR,mdsZRG where " + ! "mdsMSH.segmentID=mdsPID.segmentID AND mdsMSH.segmentID=providerLabRouting.lab_no " + ! "AND mdsMSH.segmentID=mdsPV1.segmentID AND mdsMSH.segmentID=mdsZFR.segmentID " + ! "AND mdsMSH.segmentID=mdsOBR.segmentID AND mdsMSH.segmentID=mdsZRG.segmentID " + ! "AND providerLabRouting.status like '%"+status+"%' AND providerLabRouting.provider_no like '"+(providerNo.equals("")?"%":providerNo)+"'" + ! "AND mdsPID.patientName like '"+patientLastName+"%^"+patientFirstName+"%^%' AND mdsPID.healthNumber like '%"+patientHealthNumber+"%' group by mdsMSH.segmentID"; ! } else { ! sql = "SELECT mdsMSH.segmentID, mdsPID.patientName, mdsPID.healthNumber, " + ! "mdsPID.sex, max(mdsZFR.abnormalFlag) as abnormalFlag, mdsMSH.dateTime, mdsOBR.quantityTiming, mdsPV1.refDoctor, " + ! "min(mdsZFR.reportFormStatus) as reportFormStatus, mdsZRG.reportGroupDesc " + ! "FROM mdsMSH,mdsPID,patientLabRouting,mdsPV1,mdsZFR,mdsOBR,mdsZRG where " + ! "mdsMSH.segmentID=mdsPID.segmentID AND mdsMSH.segmentID=patientLabRouting.lab_no " + ! "AND mdsMSH.segmentID=mdsPV1.segmentID AND mdsMSH.segmentID=mdsZFR.segmentID " + ! "AND mdsMSH.segmentID=mdsOBR.segmentID AND mdsMSH.segmentID=mdsZRG.segmentID " + ! "AND patientLabRouting.demographic_no='"+demographicNo+"' group by mdsMSH.segmentID"; ! } ! ! ResultSet rs = db.GetSQL(sql); ! while(rs.next()){ ! segmentID.add(Integer.toString(rs.getInt("segmentID"))); ! if (demographicNo == null && !providerNo.equals("0")) { ! acknowledgedStatus.add(rs.getString("status")); ! } else { ! acknowledgedStatus.add("U"); ! } ! ! healthNumber.add(rs.getString("healthNumber")); ! patientName.add(beautifyName(rs.getString("patientName"))); ! sex.add(rs.getString("sex")); ! resultStatus.add(rs.getString("abnormalFlag")); ! dateTime.add(rs.getString("dateTime")); ! ! switch ( rs.getString("quantityTiming").charAt(0) ) { ! case 'C' : priority.add("Critical"); break; ! case 'S' : priority.add("Stat\\Urgent"); break; ! case 'U' : priority.add("Unclaimed"); break; ! case 'A' : if ( rs.getString("quantityTiming").startsWith("AL") ) { ! priority.add("Alert"); ! } else { ! priority.add("ASAP"); ! } ! break; ! default: priority.add("Routine"); break; ! } ! ! requestingClient.add(ProviderData.beautifyProviderName(rs.getString("refDoctor"))); ! reportStatus.add(rs.getString("reportFormStatus")); ! ! if ( rs.getString("reportGroupDesc").startsWith("MICRO") ) { ! discipline.add("Microbiology"); ! } else if ( rs.getString("reportGroupDesc").startsWith("DIAGNOSTIC IMAGING") ) { ! discipline.add("Diagnostic Imaging"); ! } else { ! discipline.add("Hem/Chem/Other"); ! } ! } ! rs.close(); ! db.CloseConn(); ! }catch(Exception e){ ! System.out.println("exception in MDSResultsData:"+e); ! } ! } ! ! private String beautifyName(String name) { ! try { ! return name.substring(0, name.indexOf("^")) + ", " ! + name.substring(name.indexOf("^") + 1).replace('^', ' '); ! } catch (IndexOutOfBoundsException e) { ! return name.replace('^', ' '); ! } ! } ! ! ! public static boolean updateReportStatus (Properties props, int labNo, int providerNo, char status, String comment) { ! ! try { ! DBPreparedHandler db = new DBPreparedHandler( props.getProperty("db_driver"), props.getProperty("db_uri")+props.getProperty("db_name"), props.getProperty("db_username"), props.getProperty("db_password") ); ! // handles the case where this provider/lab combination is not already in providerLabRouting table ! String sql = "insert ignore into providerLabRouting (provider_no, lab_no, status, comment) values ('"+providerNo+"', '"+labNo+"', '"+status+"', ?)"; ! if ( db.queryExecuteUpdate(sql, new String[] { comment }) == 0 ) { ! // handles the case where it is ! sql = "update providerLabRouting set status='"+status+"', comment=? where provider_no='"+providerNo+"' and lab_no='"+labNo+"'"; ! db.queryExecute(sql, new String[] { comment }); } else { ! sql = "delete from providerLabRouting where provider_no='0' and lab_no=?"; ! db.queryExecute(sql, new String[] { Integer.toString(labNo) }); } - db.closeConn(); - return true; - }catch(Exception e){ - System.out.println("exception in MDSResultsData.updateReportStatus():"+e); - e.printStackTrace(); - return false; - } - } - - public static boolean updateLabRouting (String[] flaggedLabs, String selectedProviders) { - boolean result; - - try { - DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String[] providersArray = selectedProviders.split(","); ! String insertString = ""; ! String deleteString = ""; ! for (int i=0; i < flaggedLabs.length; i++) { ! if (i != 0) { ! insertString = insertString + ", "; ! deleteString = deleteString + ", "; ! } ! for (int j=0; j < providersArray.length; j++) { ! if (j != 0) { ! insertString = insertString + ", "; ! } ! insertString = insertString + "('" + providersArray[j] + "','" + flaggedLabs[i] + "','N')"; ! } ! deleteString = deleteString+"'"+flaggedLabs[i]+"'"; ! } ! ! // delete old entries ! String sql = "delete from providerLabRouting where provider_no='0' and lab_no in ("+deleteString+")"; ! result = db.RunSQL(sql); ! // add new entries ! sql = "insert ignore into providerLabRouting (provider_no, lab_no, status) values "+insertString; ! result = db.RunSQL(sql); ! db.CloseConn(); ! return result; ! }catch(Exception e){ ! System.out.println("exception in MDSResultsData.updateLabRouting():"+e); ! return false; ! } ! } ! ! public static String searchPatient (String labNo) { ! try { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! ! String sql = "select demographic_no from patientLabRouting where lab_no='"+labNo+"'"; ! ResultSet rs = db.GetSQL(sql); ! db.CloseConn(); ! rs.next(); ! return rs.getString("demographic_no"); ! }catch(Exception e){ ! System.out.println("exception in MDSResultsData.searchPatient():"+e); ! return "0"; ! } ! } ! ! public static boolean updatePatientLabRouting (String labNo, String demographicNo) { ! boolean result; ! ! try { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! // delete old entries ! String sql = "delete from patientLabRouting where lab_no='"+labNo+"'"; ! result = db.RunSQL(sql); ! // add new entries ! sql = "insert into patientLabRouting (lab_no, demographic_no) values ('"+labNo+"', '"+demographicNo+"')"; ! result = db.RunSQL(sql); ! db.CloseConn(); ! return result; ! }catch(Exception e){ ! System.out.println("exception in MDSResultsData.updateLabRouting():"+e); ! return false; ! } ! } ! } --- 30,247 ---- ! public class MDSResultsData { ! public ArrayList segmentID; ! public ArrayList acknowledgedStatus; ! ! public ArrayList healthNumber; ! public ArrayList patientName; ! public ArrayList sex; ! public ArrayList resultStatus; ! public ArrayList dateTime; ! public ArrayList priority; ! public ArrayList requestingClient; ! public ArrayList discipline; ! public ArrayList reportStatus; ! ! public void populateMDSResultsData(String providerNo, String demographicNo, String patientFirstName, String patientLastName, String patientHealthNumber, String status) { ! ! if ( providerNo == null) { providerNo = ""; } ! if ( patientFirstName == null) { patientFirstName = ""; } ! if ( patientLastName == null) { patientLastName = ""; } ! if ( patientHealthNumber == null) { patientHealthNumber = ""; } ! if ( status == null ) { status = ""; } ! ! segmentID = new ArrayList(); ! acknowledgedStatus = new ArrayList(); ! ! healthNumber = new ArrayList(); ! patientName = new ArrayList(); ! sex = new ArrayList(); ! resultStatus = new ArrayList(); ! dateTime = new ArrayList(); ! priority = new ArrayList(); ! requestingClient = new ArrayList(); ! discipline = new ArrayList(); ! reportStatus = new ArrayList(); ! ! String sql = ""; ! ! try { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! if ( demographicNo == null) { // note to self: lab reports not found in the providerLabRouting table will not show up - need to ensure every lab is entered in providerLabRouting, with '0' // for the provider number if unable to find correct provider ! sql = "SELECT mdsMSH.segmentID, providerLabRouting.status, mdsPID.patientName, mdsPID.healthNumber, " + ! "mdsPID.sex, max(mdsZFR.abnormalFlag) as abnormalFlag, mdsMSH.dateTime, mdsOBR.quantityTiming, mdsPV1.refDoctor, " + ! "min(mdsZFR.reportFormStatus) as reportFormStatus, mdsZRG.reportGroupDesc " + ! "FROM mdsMSH,mdsPID,providerLabRouting,mdsPV1,mdsZFR,mdsOBR,mdsZRG where " + ! "mdsMSH.segmentID=mdsPID.segmentID AND mdsMSH.segmentID=providerLabRouting.lab_no " + ! "AND mdsMSH.segmentID=mdsPV1.segmentID AND mdsMSH.segmentID=mdsZFR.segmentID " + ! "AND mdsMSH.segmentID=mdsOBR.segmentID AND mdsMSH.segmentID=mdsZRG.segmentID " + ! "AND providerLabRouting.status like '%"+status+"%' AND providerLabRouting.provider_no like '"+(providerNo.equals("")?"%":providerNo)+"'" + ! "AND mdsPID.patientName like '"+patientLastName+"%^"+patientFirstName+"%^%' AND mdsPID.healthNumber like '%"+patientHealthNumber+"%' group by mdsMSH.segmentID"; ! } else { ! sql = "SELECT mdsMSH.segmentID, mdsPID.patientName, mdsPID.healthNumber, " + ! "mdsPID.sex, max(mdsZFR.abnormalFlag) as abnormalFlag, mdsMSH.dateTime, mdsOBR.quantityTiming, mdsPV1.refDoctor, " + ! "min(mdsZFR.reportFormStatus) as reportFormStatus, mdsZRG.reportGroupDesc " + ! "FROM mdsMSH,mdsPID,patientLabRouting,mdsPV1,mdsZFR,mdsOBR,mdsZRG where " + ! "mdsMSH.segmentID=mdsPID.segmentID AND mdsMSH.segmentID=patientLabRouting.lab_no " + ! "AND mdsMSH.segmentID=mdsPV1.segmentID AND mdsMSH.segmentID=mdsZFR.segmentID " + ! "AND mdsMSH.segmentID=mdsOBR.segmentID AND mdsMSH.segmentID=mdsZRG.segmentID " + ! "AND patientLabRouting.demographic_no='"+demographicNo+"' group by mdsMSH.segmentID"; ! } ! ! ResultSet rs = db.GetSQL(sql); ! while(rs.next()){ ! segmentID.add(Integer.toString(rs.getInt("segmentID"))); ! if (demographicNo == null && !providerNo.equals("0")) { ! acknowledgedStatus.add(rs.getString("status")); } else { ! acknowledgedStatus.add("U"); } ! healthNumber.add(rs.getString("healthNumber")); ! patientName.add(beautifyName(rs.getString("patientName"))); ! sex.add(rs.getString("sex")); ! resultStatus.add(rs.getString("abnormalFlag")); ! dateTime.add(rs.getString("dateTime")); ! switch ( rs.getString("quantityTiming").charAt(0) ) { ! case 'C' : priority.add("Critical"); break; ! case 'S' : priority.add("Stat\\Urgent"); break; ! case 'U' : priority.add("Unclaimed"); break; ! case 'A' : if ( rs.getString("quantityTiming").startsWith("AL") ) { ! priority.add("Alert"); ! } else { ! priority.add("ASAP"); ! } ! break; ! default: priority.add("Routine"); break; ! } ! requestingClient.add(ProviderData.beautifyProviderName(rs.getString("refDoctor"))); ! reportStatus.add(rs.getString("reportFormStatus")); ! if ( rs.getString("reportGroupDesc").startsWith("MICRO") ) { ! discipline.add("Microbiology"); ! } else if ( rs.getString("reportGroupDesc").startsWith("DIAGNOSTIC IMAGING") ) { ! discipline.add("Diagnostic Imaging"); ! } else { ! discipline.add("Hem/Chem/Other"); ! } ! } ! rs.close(); ! db.CloseConn(); ! }catch(Exception e){ ! System.out.println("exception in MDSResultsData:"+e); ! } ! } ! ! private String beautifyName(String name) { ! try { ! return name.substring(0, name.indexOf("^")) + ", " ! + name.substring(name.indexOf("^") + 1).replace('^', ' '); ! } catch (IndexOutOfBoundsException e) { ! return name.replace('^', ' '); ! } ! } ! ! ! public static boolean updateReportStatus(Properties props, int labNo, int providerNo, char status, String comment) { ! ! try { ! DBPreparedHandler db = new DBPreparedHandler( props.getProperty("db_driver"), props.getProperty("db_uri")+props.getProperty("db_name"), props.getProperty("db_username"), props.getProperty("db_password") ); ! // handles the case where this provider/lab combination is not already in providerLabRouting table ! String sql = "insert ignore into providerLabRouting (provider_no, lab_no, status, comment) values ('"+providerNo+"', '"+labNo+"', '"+status+"', ?)"; ! if ( db.queryExecuteUpdate(sql, new String[] { comment }) == 0 ) { ! // handles the case where it is ! sql = "update providerLabRouting set status='"+status+"', comment=? where provider_no='"+providerNo+"' and lab_no='"+labNo+"'"; ! db.queryExecute(sql, new String[] { comment }); ! } else { ! sql = "delete from providerLabRouting where provider_no='0' and lab_no=?"; ! db.queryExecute(sql, new String[] { Integer.toString(labNo) }); ! } ! db.closeConn(); ! return true; ! }catch(Exception e){ ! System.out.println("exception in MDSResultsData.updateReportStatus():"+e); ! e.printStackTrace(); ! return false; ! } ! } ! ! public static boolean updateLabRouting(String[] flaggedLabs, String selectedProviders) { ! boolean result; ! ! try { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! ! String[] providersArray = selectedProviders.split(","); ! String insertString = ""; ! String deleteString = ""; ! for (int i=0; i < flaggedLabs.length; i++) { ! if (i != 0) { ! insertString = insertString + ", "; ! deleteString = deleteString + ", "; ! } ! for (int j=0; j < providersArray.length; j++) { ! if (j != 0) { ! insertString = insertString + ", "; ! } ! insertString = insertString + "('" + providersArray[j] + "','" + flaggedLabs[i] + "','N')"; ! } ! deleteString = deleteString+"'"+flaggedLabs[i]+"'"; ! } ! ! // delete old entries ! String sql = "delete from providerLabRouting where provider_no='0' and lab_no in ("+deleteString+")"; ! result = db.RunSQL(sql); ! ! // add new entries ! sql = "insert ignore into providerLabRouting (provider_no, lab_no, status) values "+insertString; ! result = db.RunSQL(sql); ! db.CloseConn(); ! return result; ! }catch(Exception e){ ! System.out.println("exception in MDSResultsData.updateLabRouting():"+e); ! return false; ! } ! } ! ! public static String searchPatient(String labNo) { ! try { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! ! String sql = "select demographic_no from patientLabRouting where lab_no='"+labNo+"'"; ! ResultSet rs = db.GetSQL(sql); ! db.CloseConn(); ! rs.next(); ! return rs.getString("demographic_no"); ! }catch(Exception e){ ! System.out.println("exception in MDSResultsData.searchPatient():"+e); ! return "0"; ! } ! } ! ! public static boolean updatePatientLabRouting(String labNo, String demographicNo) { ! boolean result; ! ! try { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! ! // delete old entries ! String sql = "delete from patientLabRouting where lab_no='"+labNo+"'"; ! result = db.RunSQL(sql); ! ! // add new entries ! sql = "insert into patientLabRouting (lab_no, demographic_no) values ('"+labNo+"', '"+demographicNo+"')"; ! result = db.RunSQL(sql); ! db.CloseConn(); ! return result; ! }catch(Exception e){ ! System.out.println("exception in MDSResultsData.updateLabRouting():"+e); ! return false; ! } ! } ! } |
|
From: Jay G. <jay...@us...> - 2004-11-26 20:15:51
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3939 Modified Files: SearchPatientAction.java Log Message: Added patients name the secondary search if the patient can't be found in the default search Index: SearchPatientAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil/SearchPatientAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SearchPatientAction.java 21 Jul 2004 15:15:30 -0000 1.2 --- SearchPatientAction.java 26 Nov 2004 20:15:42 -0000 1.3 *************** *** 1,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 */ package oscar.oscarMDS.pageUtil; --- 1,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 */ package oscar.oscarMDS.pageUtil; *************** *** 33,68 **** import oscar.oscarMDS.data.MDSResultsData; ! public class SearchPatientAction extends Action ! { ! ! public SearchPatientAction() ! { ! } ! ! public ActionForward perform(ActionMapping mapping, ! ActionForm form, ! HttpServletRequest request, ! HttpServletResponse response) ! throws ServletException, IOException ! { ! // System.out.println("inside ReportStatusUpdateAction"); ! ! String labNo = request.getParameter("segmentID"); ! String newURL = ""; ! ! try { ! String demographicNo = MDSResultsData.searchPatient(labNo); ! if ( ! demographicNo.equals("0") ) { ! newURL = mapping.findForward("success").getPath(); ! newURL = newURL + "?demographicNo="+demographicNo; ! } else { ! newURL = mapping.findForward("failure").getPath(); ! } ! } catch (Exception e) { ! System.out.println("exception in SearchPatientAction:"+e); ! newURL = mapping.findForward("failure").getPath(); ! } ! newURL = newURL + "&labNo="+labNo; ! return new ActionForward(newURL); ! } } \ No newline at end of file --- 33,64 ---- import oscar.oscarMDS.data.MDSResultsData; ! public class SearchPatientAction extends Action { ! ! public SearchPatientAction() { ! } ! ! public ActionForward perform(ActionMapping mapping,ActionForm form,HttpServletRequest request,HttpServletResponse response) ! throws ServletException, IOException { ! //System.out.println("inside ReportStatusUpdateAction"); ! ! String labNo = request.getParameter("segmentID"); ! String name = request.getParameter("name"); ! String newURL = ""; ! ! try { ! String demographicNo = MDSResultsData.searchPatient(labNo); ! if ( ! demographicNo.equals("0") ) { ! newURL = mapping.findForward("success").getPath(); ! newURL = newURL + "?demographicNo="+demographicNo; ! } else { ! newURL = mapping.findForward("failure").getPath(); ! } ! } catch (Exception e) { ! System.out.println("exception in SearchPatientAction:"+e); ! newURL = mapping.findForward("failure").getPath(); ! } ! newURL = newURL + "&labNo="+labNo+"&keyword="+java.net.URLEncoder.encode(name); ! //System.out.println("url "+newURL); ! return new ActionForward(newURL); ! } } \ No newline at end of file |
|
From: Jay G. <jay...@us...> - 2004-11-26 20:13:52
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3477 Modified Files: struts-config.xml Log Message: changed forward in action in oscarMDS/SearchPatient added limit1=0 and limit2=10 Index: struts-config.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/struts-config.xml,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** struts-config.xml 25 Nov 2004 05:52:28 -0000 1.57 --- struts-config.xml 26 Nov 2004 20:13:43 -0000 1.58 *************** *** 690,694 **** scope="request" name="/SegmentDisplay.jsp"> ! <forward name="failure" path="/oscarMDS/PatientSearch.jsp?keyword=&search_mode=search_name"/> <forward name="success" path="/oscarMDS/OpenEChart.jsp"/> </action> --- 690,694 ---- scope="request" name="/SegmentDisplay.jsp"> ! <forward name="failure" path="/oscarMDS/PatientSearch.jsp?search_mode=search_name&limit1=0&limit2=10"/> <forward name="success" path="/oscarMDS/OpenEChart.jsp"/> </action> |
|
From: Jay G. <jay...@us...> - 2004-11-26 20:06:50
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1948 Modified Files: SegmentDisplay.jsp Log Message: Added name to SearchPatientAction call so it can be used and not need to be looked up Index: SegmentDisplay.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS/SegmentDisplay.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SegmentDisplay.jsp 20 Jul 2004 20:02:44 -0000 1.8 --- SegmentDisplay.jsp 26 Nov 2004 20:06:40 -0000 1.9 *************** *** 191,195 **** <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="window.close()"> <% } else { // we were called from lab module %> ! <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="popupStart(360, 680, 'SearchPatient.do?segmentID=<%= request.getParameter("segmentID")%>', 'searchPatientWindow')"> <% } %> </td> --- 191,195 ---- <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="window.close()"> <% } else { // we were called from lab module %> ! <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="popupStart(360, 680, 'SearchPatient.do?segmentID=<%= request.getParameter("segmentID")%>&name=<%=java.net.URLEncoder.encode(pd.getPatientName())%>', 'searchPatientWindow')"> <% } %> </td> |
|
From: Jay G. <jay...@us...> - 2004-11-25 20:54:36
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25837 Modified Files: dbhtmlDocument.jsp Log Message: fixed bug that wouldn't allow you to add htmldocuments if there was no creator Index: dbhtmlDocument.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms/dbhtmlDocument.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dbhtmlDocument.jsp 6 Nov 2003 18:48:30 -0000 1.4 --- dbhtmlDocument.jsp 25 Nov 2004 20:54:21 -0000 1.5 *************** *** 41,164 **** String nowDate = String.valueOf(curYear)+"/"+String.valueOf(curMonth) + "/" + String.valueOf(curDay)+ " " +now.get(Calendar.HOUR_OF_DAY)+":"+now.get(Calendar.MINUTE) + ":"+now.get(Calendar.SECOND); ! String module="", module_id="", doctype="", docdesc="", docxml="", doccreator="", docdate="", docfilename=""; ! module = request.getParameter("function"); ! module_id = request.getParameter("functionid"); ! doctype = request.getParameter("doctype"); ! docdesc = request.getParameter("docdesc"); ! doccreator = request.getParameter("doccreator"); ! docdate = request.getParameter("docdate"); ! docfilename =request.getParameter("docfilename"); ! docxml =request.getParameter("docxml"); %> <html:html locale="true"> ! <% ! if (docdesc.compareTo("") == 0 || docfilename.compareTo("") == 0 || doctype.compareTo("") == 0 || docxml.compareTo("")==0) { ! ! %> ! <jsp:forward page='errorpage.jsp' > ! <jsp:param name="msg" value='<bean:message key="dms.documentDelete.msgError"/>' /> ! <jsp:param name="doctype" value='<%=doctype%>' /> ! <jsp:param name="docfilename" value='<%=docfilename%>' /> ! <jsp:param name="docdesc" value='<%=docdesc%>' /> ! ! </jsp:forward> ! <% ! ! } ! else { ! ! ResultSet rsdemo2 = null; ! int count1 = 0; ! String[] param4=new String[4]; ! ! ! param4[0] = docfilename; ! param4[1] = ""; ! param4[2] = ""; ! param4[3] = ""; ! rsdemo2 = apptMainBean.queryResults(param4, "search_document"); ! while (rsdemo2.next()) { ! ! count1 = count1 + 1; ! } ! if ( count1 > 0){ ! %> ! ! <jsp:forward page='documentList.jsp' > ! <jsp:param name="orderby" value='updatedatetime desc' /> ! <jsp:param name="creator" value='<%=doccreator%>' /> ! <jsp:param name="doctype" value='' /> ! <jsp:param name="docdesc" value='' /> ! <jsp:param name="docfilename" value='' /> ! </jsp:forward> ! ! ! <% ! } ! else { ! ! ! ! String[] param =new String[7]; ! param[0]=doctype; ! param[1]=docdesc; ! param[2]=docxml; ! param[3]=docfilename; ! param[4]=doccreator; ! param[5]=docdate; ! param[6]="H"; ! int rowsAffected = apptMainBean.queryExecuteUpdate(param,"save_document"); ! ! String docNo = null; ! ! ResultSet rsdemo = null; ! String[] param3 =new String[4]; ! ! ! param3[0]=docfilename; ! param3[1]=""; ! param3[2]=""; ! param3[3]=""; ! ! rsdemo = apptMainBean.queryResults(param3, "search_document"); ! while (rsdemo.next()) { ! docNo = rsdemo.getString("document_no"); ! } ! ! ! int recordAffected=0; ! ! ! String[] param2 = new String[4]; ! param2[0] = module.trim(); ! param2[1] = module_id.trim(); ! param2[2] = docNo.trim(); ! param2[3] = "H"; ! ! recordAffected = apptMainBean.queryExecuteUpdate(param2,"save_ctl_document"); ! ! ! ! ! ! ! ! %> ! <jsp:forward page='documentList.jsp' > ! <jsp:param name="orderby" value='updatedatetime desc' /> ! <jsp:param name="creator" value='<%=doccreator%>' /> ! <jsp:param name="doctype" value='' /> ! <jsp:param name="docdesc" value='' /> ! <jsp:param name="docfilename" value='' /> ! </jsp:forward> ! <% ! } ! } ! ! %> </html:html> \ No newline at end of file --- 41,120 ---- String nowDate = String.valueOf(curYear)+"/"+String.valueOf(curMonth) + "/" + String.valueOf(curDay)+ " " +now.get(Calendar.HOUR_OF_DAY)+":"+now.get(Calendar.MINUTE) + ":"+now.get(Calendar.SECOND); ! String module="", module_id="", doctype="", docdesc="", docxml="", doccreator="", docdate="", docfilename=""; ! module = request.getParameter("function"); ! module_id = request.getParameter("functionid"); ! doctype = request.getParameter("doctype"); ! docdesc = request.getParameter("docdesc"); ! doccreator = request.getParameter("doccreator"); ! docdate = request.getParameter("docdate"); ! docfilename =request.getParameter("docfilename"); ! docxml =request.getParameter("docxml"); %> <html:html locale="true"> ! <%if (docdesc.compareTo("") == 0 || docfilename.compareTo("") == 0 || doctype.compareTo("") == 0 || docxml.compareTo("")==0) { %> ! <jsp:forward page='errorpage.jsp' > ! <jsp:param name="msg" value='<bean:message key="dms.documentDelete.msgError"/>' /> ! <jsp:param name="doctype" value='<%=doctype%>' /> ! <jsp:param name="docfilename" value='<%=docfilename%>' /> ! <jsp:param name="docdesc" value='<%=docdesc%>' /> ! </jsp:forward> ! <%}else{ ! ResultSet rsdemo2 = null; ! int count1 = 0; ! String[] param4=new String[1]; ! param4[0] = docfilename; ! rsdemo2 = apptMainBean.queryResults(param4, "search_document_by_file_name"); ! while (rsdemo2.next()) { ! count1 = count1 + 1; ! } ! if ( count1 > 0){ %> ! <jsp:forward page='documentList.jsp' > ! <jsp:param name="orderby" value='updatedatetime desc' /> ! <jsp:param name="creator" value='<%=doccreator%>' /> ! <jsp:param name="doctype" value='' /> ! <jsp:param name="docdesc" value='' /> ! <jsp:param name="docfilename" value='' /> ! </jsp:forward> ! ! <%} else { ! String[] param =new String[7]; ! param[0]=doctype; ! param[1]=docdesc; ! param[2]=docxml; ! param[3]=docfilename; ! param[4]=doccreator; ! param[5]=docdate; ! param[6]="H"; ! int rowsAffected = apptMainBean.queryExecuteUpdate(param,"save_document"); ! String docNo = null; ! ResultSet rsdemo = null; ! String[] param3 =new String[1]; ! param3[0]=docfilename; ! ! rsdemo = apptMainBean.queryResults(param3, "search_document_by_file_name"); ! while (rsdemo.next()) { ! docNo = rsdemo.getString("document_no"); ! } ! int recordAffected=0; ! String[] param2 = new String[4]; ! param2[0] = module.trim(); ! param2[1] = module_id.trim(); ! param2[2] = docNo.trim(); ! param2[3] = "H"; ! recordAffected = apptMainBean.queryExecuteUpdate(param2,"save_ctl_document"); ! %> ! <jsp:forward page='documentList.jsp' > ! <jsp:param name="orderby" value='updatedatetime desc' /> ! <jsp:param name="creator" value='<%=doccreator%>' /> ! <jsp:param name="doctype" value='' /> ! <jsp:param name="docdesc" value='' /> ! <jsp:param name="docfilename" value='' /> ! </jsp:forward> ! <%} ! }%> </html:html> \ No newline at end of file |
|
From: Jay G. <jay...@us...> - 2004-11-25 15:51:23
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/immunization In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26663 Modified Files: Schedule.jsp Log Message: moved if statement so it was only around display div Index: Schedule.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/immunization/Schedule.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Schedule.jsp 25 Nov 2004 05:43:53 -0000 1.7 --- Schedule.jsp 25 Nov 2004 15:51:13 -0000 1.8 *************** *** 39,42 **** --- 39,47 ---- return; } + + + Document doc = UtilXML.parseXML(sDoc); + Element root = doc.getDocumentElement(); + NodeList sets = root.getElementsByTagName("immunizationSet"); %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> *************** *** 52,57 **** <style type="text/css"> ! .ellipsis ! { height:15px; width:15px; --- 57,61 ---- <style type="text/css"> ! .ellipsis{ height:15px; width:15px; *************** *** 60,72 **** } ! TD.normal ! { height:30px; width:90px; } ! ! TD.head ! { background-color: #b3cefd; font-weight:bold; --- 64,73 ---- } ! TD.normal{ height:30px; width:90px; } ! TD.head{ background-color: #b3cefd; font-weight:bold; *************** *** 75,80 **** } ! TD.grey ! { height:30px; width:90px; --- 76,80 ---- } ! TD.grey{ height:30px; width:90px; *************** *** 90,116 **** } ! function edit(nodeName, colName) ! { windowprops = "height=443,width=630,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=0"; window.open('ScheduleEdit.jsp?node=' + nodeName + '&name=' + colName,"<bean:message key="oscarEncounter.immunization.Schedule.msgRecordImm"/>",windowprops); } ! function returnEdit(nodeName, givenDate, refusedDate, lot, provider, comments) ! { var frm = document.forms[0]; var label; ! if(givenDate != "") ! { label = givenDate; ! } ! else ! { ! if(refusedDate != "") ! { label = "<bean:message key="oscarEncounter.immunization.Schedule.msgRefused"/>"+" "+refusedDate; ! } ! else ! { label = ""; } --- 90,108 ---- } ! function edit(nodeName, colName){ windowprops = "height=443,width=630,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=0"; window.open('ScheduleEdit.jsp?node=' + nodeName + '&name=' + colName,"<bean:message key="oscarEncounter.immunization.Schedule.msgRecordImm"/>",windowprops); } ! function returnEdit(nodeName, givenDate, refusedDate, lot, provider, comments){ var frm = document.forms[0]; var label; ! if(givenDate != ""){ label = givenDate; ! }else{ ! if(refusedDate != ""){ label = "<bean:message key="oscarEncounter.immunization.Schedule.msgRefused"/>"+" "+refusedDate; ! }else{ label = ""; } *************** *** 130,156 **** var b = false; ! if(ev.target!=null) ! { ! if(ev.target.checked) ! { b = true; } ! } ! else ! { ! if(event.srcElement.checked) ! { b = true; } } ! if(b==true) ! { tbl.style.display=''; //document.tblSetBar.style.display=''; // document.getElementById("tblSetBar").style.display=''; ! } ! else ! { tbl.style.display='none'; // document.getElementById("tblSetBar").style.display='none'; --- 122,140 ---- var b = false; ! if(ev.target!=null){ ! if(ev.target.checked){ b = true; } ! }else{ ! if(event.srcElement.checked){ b = true; } } ! if(b==true){ tbl.style.display=''; //document.tblSetBar.style.display=''; // document.getElementById("tblSetBar").style.display=''; ! }else{ tbl.style.display='none'; // document.getElementById("tblSetBar").style.display='none'; *************** *** 219,227 **** <tr> <td> ! <% ! Document doc = UtilXML.parseXML(sDoc); ! Element root = doc.getDocumentElement(); ! NodeList sets = root.getElementsByTagName("immunizationSet"); ! %> <input type="button" value="<bean:message key="global.btnSave"/>" onclick="formSubmit('Save');" style="width:100px" /> </td> --- 203,207 ---- <tr> <td> ! <input type="button" value="<bean:message key="global.btnSave"/>" onclick="formSubmit('Save');" style="width:100px" /> </td> *************** *** 268,272 **** </div> ! <table cellpadding=2 cellspacing=0 border="2px" rules="all" id="tblSet<%=i%>" style="display:none" > <% --- 248,252 ---- </div> ! <%}%> <table cellpadding=2 cellspacing=0 border="2px" rules="all" id="tblSet<%=i%>" style="display:none" > <% *************** *** 355,359 **** %> </table> ! <%} } --- 335,339 ---- %> </table> ! <%//} } |
|
From: Jay G. <jay...@us...> - 2004-11-25 05:56:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3389 Added Files: EctImmDeleteImmScheduleAction.java Log Message: init commit --- NEW FILE: EctImmDeleteImmScheduleAction.java --- /* * * 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. * * * Jason Gallagher * * This software was written for the * Department of Family Medicine * McMaster University * Hamilton * Ontario, Canada * * EctImmDeleteImmScheduleAction.java * * Created on November 23, 2004, 4:19 PM */ package oscar.oscarEncounter.immunization.pageUtil; import java.io.*; import javax.servlet.*; import javax.servlet.http.*; import org.apache.struts.action.*; import org.w3c.dom.*; import oscar.oscarEncounter.immunization.data.*; import oscar.util.*; /** * * @author Jay Gallagher */ public class EctImmDeleteImmScheduleAction extends Action { /** Creates a new instance of EctImmDeleteImmScheduleAction */ public EctImmDeleteImmScheduleAction() { } public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{ EctImmImmunizationData immData = new EctImmImmunizationData(); String demographicNo = request.getParameter("demoNo"); String providerNo = (String) request.getSession().getAttribute("user"); String method = request.getParameter("method"); String id = request.getParameter("tblSet"); int setnum = Integer.parseInt(id); try { String imm = immData.getImmunizations(demographicNo); ///String sDoc = UtilMisc.decode64(imm); Document doc = UtilXML.parseXML(imm); NodeList sets = doc.getElementsByTagName("immunizationSet"); Element set = (Element) sets.item(setnum); //System.out.println(set.getAttribute("name")); if (method.equals("delete")){ set.setAttribute("status", "deleted"); }else{ set.removeAttribute("status"); } String sXML = UtilXML.toXML(doc); //System.out.println(sXML); //EctImmImmunizationData imm = new EctImmImmunizationData(); immData.saveImmunizations(demographicNo, providerNo, sXML); } catch(Exception ex) { throw new ServletException("Exception occurred in EctImmDeleteImmScheduleAction", ex); } return mapping.findForward("success"); } } |
|
From: Jay G. <jay...@us...> - 2004-11-25 05:52:40
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2857 Modified Files: struts-config.xml Log Message: Added action /oscarEncounter/immunization/deleteSchedule Index: struts-config.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/struts-config.xml,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** struts-config.xml 18 Nov 2004 18:31:32 -0000 1.56 --- struts-config.xml 25 Nov 2004 05:52:28 -0000 1.57 *************** *** 1039,1042 **** --- 1039,1048 ---- <!-- immunization actions --> + <action path="/oscarEncounter/immunization/deleteSchedule" + type="oscar.oscarEncounter.immunization.pageUtil.EctImmDeleteImmScheduleAction" + name="EctImmPassThruForm" + scope="request"> + <forward name="success" path="/oscarEncounter/immunization/Schedule.jsp" /> + </action> <action path="/oscarEncounter/immunization/initSchedule" type="oscar.oscarEncounter.immunization.pageUtil.EctImmInitScheduleAction" |
|
From: Jay G. <jay...@us...> - 2004-11-25 05:50:13
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2495 Modified Files: EctImmSaveScheduleAction.java Log Message: added another mapping findForward to reload. used to reload page and show deleted imm templates Index: EctImmSaveScheduleAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil/EctImmSaveScheduleAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EctImmSaveScheduleAction.java 26 Feb 2004 14:47:04 -0000 1.4 --- EctImmSaveScheduleAction.java 25 Nov 2004 05:50:01 -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 // * // ----------------------------------------------------------------------------------------------------------------------- *************** *** 38,108 **** import oscar.oscarEncounter.pageUtil.EctSessionBean; ! public final class EctImmSaveScheduleAction extends Action ! { ! ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException ! { ! if(request.getParameter("hdnAction").equalsIgnoreCase("Configure")) ! return mapping.findForward("configure"); ! ! Locale locale = getLocale(request); ! MessageResources messages = getResources(request); ! ActionErrors errors = new ActionErrors(); ! EctSessionBean bean = null; ! bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean"); ! try ! { ! String sDoc = UtilMisc.decode64(request.getParameter("xmlDoc")); ! Document doc = UtilXML.parseXML(sDoc); ! NodeList sets = doc.getElementsByTagName("immunizationSet"); ! for(int i = 0; i < sets.getLength(); i++) ! { ! Element set = (Element)sets.item(i); ! NodeList rows = set.getElementsByTagName("row"); ! for(int j = 0; j < rows.getLength(); j++) ! { ! Element row = (Element)rows.item(j); ! String sRow = String.valueOf(String.valueOf((new StringBuffer("tdSet")).append(i).append("_Row").append(j))); ! if(row.getAttribute("name").length() == 0 || row.getAttribute("name") == null) ! row.setAttribute("name", request.getParameter(String.valueOf(String.valueOf(sRow)).concat("_name_text"))); ! NodeList cells = row.getElementsByTagName("cell"); ! for(int k = 0; k < cells.getLength(); k++) ! { ! Element cell = (Element)cells.item(k); ! String index = cell.getAttribute("index"); ! String sCell = String.valueOf(String.valueOf((new StringBuffer(String.valueOf(String.valueOf(sRow)))).append("_Col").append(index))); ! String givenDate = request.getParameter(String.valueOf(String.valueOf(sCell)).concat("_givenDate")); ! String refusedDate = request.getParameter(String.valueOf(String.valueOf(sCell)).concat("_refusedDate")); ! String lot = request.getParameter(String.valueOf(String.valueOf(sCell)).concat("_lot")); ! String provider = request.getParameter(String.valueOf(String.valueOf(sCell)).concat("_provider")); ! String comments = request.getParameter(String.valueOf(String.valueOf(sCell)).concat("_comments")); ! cell.setAttribute("givenDate", givenDate); ! cell.setAttribute("refusedDate", refusedDate); ! cell.setAttribute("lot", lot); ! cell.setAttribute("provider", provider); ! cell.setAttribute("comments", comments); ! } ! ! String comments = request.getParameter(String.valueOf(String.valueOf(sRow)).concat("_comments_text")); ! NodeList cmnts = row.getElementsByTagName("comments"); ! if(cmnts.getLength() > 0) ! UtilXML.setText(cmnts.item(0), comments); ! else ! UtilXML.addNode(row, "comments", comments); ! } ! } ! ! String sXML = UtilXML.toXML(doc); ! EctImmImmunizationData imm = new EctImmImmunizationData(); ! imm.saveImmunizations(bean.demographicNo, bean.providerNo, sXML); ! } ! catch(Exception ex) ! { ! throw new ServletException("Exception occurred in SaveScheduleAction", ex); ! } ! ! return mapping.findForward("reload"); ! } } --- 38,106 ---- import oscar.oscarEncounter.pageUtil.EctSessionBean; ! public final class EctImmSaveScheduleAction extends Action { ! ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException { ! if(request.getParameter("hdnAction").equalsIgnoreCase("Configure")) ! return mapping.findForward("configure"); ! ! if (request.getParameter("hdnAction").equalsIgnoreCase("ShowAll")){ ! request.setAttribute("showDeleted","true"); ! return mapping.findForward("reload"); ! } ! ! Locale locale = getLocale(request); ! MessageResources messages = getResources(request); ! ActionErrors errors = new ActionErrors(); ! EctSessionBean bean = null; ! bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean"); ! try { ! String sDoc = UtilMisc.decode64(request.getParameter("xmlDoc")); ! Document doc = UtilXML.parseXML(sDoc); ! NodeList sets = doc.getElementsByTagName("immunizationSet"); ! for(int i = 0; i < sets.getLength(); i++) { ! Element set = (Element)sets.item(i); ! NodeList rows = set.getElementsByTagName("row"); ! for(int j = 0; j < rows.getLength(); j++) { ! Element row = (Element)rows.item(j); ! String sRow = String.valueOf(String.valueOf((new StringBuffer("tdSet")).append(i).append("_Row").append(j))); ! if(row.getAttribute("name").length() == 0 || row.getAttribute("name") == null) ! row.setAttribute("name", request.getParameter(String.valueOf(String.valueOf(sRow)).concat("_name_text"))); ! NodeList cells = row.getElementsByTagName("cell"); ! for(int k = 0; k < cells.getLength(); k++) { ! Element cell = (Element)cells.item(k); ! String index = cell.getAttribute("index"); ! String sCell = String.valueOf(String.valueOf((new StringBuffer(String.valueOf(String.valueOf(sRow)))).append("_Col").append(index))); ! String givenDate = request.getParameter(String.valueOf(String.valueOf(sCell)).concat("_givenDate")); ! String refusedDate = request.getParameter(String.valueOf(String.valueOf(sCell)).concat("_refusedDate")); ! String lot = request.getParameter(String.valueOf(String.valueOf(sCell)).concat("_lot")); ! String provider = request.getParameter(String.valueOf(String.valueOf(sCell)).concat("_provider")); ! String comments = request.getParameter(String.valueOf(String.valueOf(sCell)).concat("_comments")); ! cell.setAttribute("givenDate", givenDate); ! cell.setAttribute("refusedDate", refusedDate); ! cell.setAttribute("lot", lot); ! cell.setAttribute("provider", provider); ! cell.setAttribute("comments", comments); ! } ! ! String comments = request.getParameter(String.valueOf(String.valueOf(sRow)).concat("_comments_text")); ! NodeList cmnts = row.getElementsByTagName("comments"); ! if(cmnts.getLength() > 0) ! UtilXML.setText(cmnts.item(0), comments); ! else ! UtilXML.addNode(row, "comments", comments); } ! ! } ! ! String sXML = UtilXML.toXML(doc); ! EctImmImmunizationData imm = new EctImmImmunizationData(); ! imm.saveImmunizations(bean.demographicNo, bean.providerNo, sXML); ! } ! catch(Exception ex) { ! throw new ServletException("Exception occurred in SaveScheduleAction", ex); ! } ! ! return mapping.findForward("reload"); ! } } |
|
From: Jay G. <jay...@us...> - 2004-11-25 05:44:04
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/immunization In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1464 Modified Files: Schedule.jsp Log Message: Changed page payout, added ability to delete imm templates from page record. Index: Schedule.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/immunization/Schedule.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Schedule.jsp 19 Apr 2004 18:02:27 -0000 1.6 --- Schedule.jsp 25 Nov 2004 05:43:53 -0000 1.7 *************** *** 43,47 **** <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> ! <link rel="stylesheet" type="text/css" href="../encounterStyles.css"> <html> <head> --- 43,47 ---- <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> ! <html> <head> *************** *** 49,52 **** --- 49,53 ---- <bean:message key="oscarEncounter.immunization.Schedule.title"/> </title> + <link rel="stylesheet" type="text/css" href="../encounterStyles.css"> <style type="text/css"> *************** *** 215,219 **** <td> ! <table width="80%"> <tr> <td> --- 216,220 ---- <td> ! <table border=0> <tr> <td> *************** *** 226,231 **** </td> <td align="right"> ! <input type="button" value="<bean:message key="oscarEncounter.immunization.Schedule.btnConf"/>" onclick="formSubmit('Configure');" style="width:100px" /> ! <input type="button" value="<bean:message key="global.btnClose"/>" onclick="window.close();" style="width:100px" /> </td> </tr> --- 227,237 ---- </td> <td align="right"> ! <input type="button" value="<bean:message key="oscarEncounter.immunization.Schedule.btnConf"/>" onclick="formSubmit('Configure');" style="width:100px" /> ! </td> ! <td> ! <input type="button" value="Show All" onclick="formSubmit('ShowAll');" style="width:100px" /> ! </td> ! <td> ! <input type="button" value="<bean:message key="global.btnClose"/>" onclick="window.close();" style="width:100px" /> </td> </tr> *************** *** 239,358 **** <% ! for(int i=0; i<sets.getLength(); i++) ! { Element set = (Element)sets.item(i); ! %> ! <div style="font-weight: bold"> ! <input type="checkbox" onclick="javascript:showSet('tblSet<%=i%>', event);" id="chkSet<%=i%>" /> ! <a href=# onclick="javascript:showSetName('tblSet<%=i%>', 'chkSet<%=i%>');"> ! <%= set.getAttribute("name") %></a> ! </div> ! ! <table cellpadding=2 cellspacing=0 border="2px" rules="all" id="tblSet<%=i%>" style="display:none" > ! <% ! ! int colCount = -1; ! Element columnList = (Element)set.getElementsByTagName("columnList").item(0); ! NodeList columns = columnList.getElementsByTagName("column"); ! ! if(set.getAttribute("headers").equalsIgnoreCase("true")) ! { ! %><tr> ! <td class="head"> </td><% ! for(int j=0; j<columns.getLength(); j++) ! { ! Element column = (Element)columns.item(j); ! %><td class="head"><%= column.getAttribute("name") %> </td><% ! colCount = j+2; ! } ! %><td class="head"><bean:message key="oscarEncounter.immunization.Schedule.msgComments"/></td> ! </tr><% ! } ! Element rowList = (Element)set.getElementsByTagName("rowList").item(0); ! NodeList rows = rowList.getElementsByTagName("row"); ! for(int j=0; j<rows.getLength(); j++) ! { ! Element row = (Element)rows.item(j); ! String sName = row.getAttribute("name"); ! if(sName.length()<1) ! { ! String s = "tdSet" + i + "_Row" + j + "_name"; ! %><tr><td class="head" id="<%=s%>"><%=genText(s, "")%></td><% ! } ! else ! { ! %><tr><td class="head"><%= sName %></td><% ! } ! if(colCount>0) ! { ! int n=0; ! NodeList cells = row.getElementsByTagName("cell"); ! for(int k=1; k<colCount; k++) ! { ! Element cell = (Element)cells.item(n); ! if(cell != null) ! { ! if(String.valueOf(k).equals(cell.getAttribute("index"))) ! { ! String s = "tdSet" + i + "_Row" + j + "_Col" + k; ! %><td class="normal" id="<%=s%>"><%= genCell(s, cell, sName+" - "+((Element)columns.item(k-1)).getAttribute("name"))%></td><% ! n++; ! } ! else ! { ! %><td class="grey"> </td><% ! } ! } ! else ! { ! %><td class="grey"> </td><% } ! } ! } ! else ! { ! NodeList cells = row.getElementsByTagName("cell"); ! for(int k=0; k<cells.getLength(); k++) ! { ! Element cell = (Element)cells.item(k); ! if(cell.getAttribute("index").equals(String.valueOf(k+1))) ! { ! String s = "tdSet" + i + "_Row" + j + "_Col" + (k+1); ! %><td id="<%=s%>"><%= genCell(s, cell, "")%></td><% ! } ! else ! { ! %><td class="grey"> </td><% } ! } ! } ! ! String sID = "tdSet" + i + "_Row" + j + "_comments"; ! String sValue = ""; ! ! NodeList comments = row.getElementsByTagName("comments"); ! if(comments.getLength()>0) ! { ! sValue = UtilXML.getText(comments.item(0)); ! } ! ! %><td id="<%=sID%>"><%= genText(sID, sValue)%></td><% ! %></tr><% ! } %> </table> ! <% } --- 245,359 ---- <% ! for(int i=0; i<sets.getLength(); i++){ Element set = (Element)sets.item(i); ! String status = set.getAttribute("status"); ! String showDeleted = (String) request.getAttribute("showDeleted"); ! if (showDeleted == null) {showDeleted = "";} ! ! if ( (status != null && !status.equals("deleted")) || showDeleted.equals("true") ){ ! String fontStyle = ""; ! if (status.equals("deleted")){ fontStyle= "style=\"text-decoration: line-through;\"";} %> ! <div style="font-weight: bold"> ! <input type="checkbox" onclick="javascript:showSet('tblSet<%=i%>', event);" id="chkSet<%=i%>" /> ! <a href=# onclick="javascript:showSetName('tblSet<%=i%>', 'chkSet<%=i%>');" <%=fontStyle%> > ! <%= set.getAttribute("name") %></a> ! ! ! <% if (!status.equals("deleted")){ %> ! <a href="deleteSchedule.do?method=delete&tblSet=<%=i%>&demoNo=<%=bean.demographicNo%>" onclick="return confirm('Are you sure you want to delete this record ?');" >del</a> ! <%}else{%> ! <a href="deleteSchedule.do?method=restore&tblSet=<%=i%>&demoNo=<%=bean.demographicNo%>" onclick="return confirm('Are you sure you want to restore this record ?');" >restore</a> ! <%}%> ! ! </div> ! <table cellpadding=2 cellspacing=0 border="2px" rules="all" id="tblSet<%=i%>" style="display:none" > ! <% ! int colCount = -1; ! Element columnList = (Element)set.getElementsByTagName("columnList").item(0); ! NodeList columns = columnList.getElementsByTagName("column"); ! if(set.getAttribute("headers").equalsIgnoreCase("true")){%> ! <tr> ! <td class="head"> </td><% ! for(int j=0; j<columns.getLength(); j++){ ! Element column = (Element)columns.item(j);%> ! <td class="head"><%= column.getAttribute("name") %> </td> ! <%colCount = j+2; ! }%> ! <td class="head"><bean:message key="oscarEncounter.immunization.Schedule.msgComments"/></td> ! </tr> ! <%} ! Element rowList = (Element)set.getElementsByTagName("rowList").item(0); ! NodeList rows = rowList.getElementsByTagName("row"); ! for(int j=0; j<rows.getLength(); j++){ ! Element row = (Element)rows.item(j); ! String sName = row.getAttribute("name"); ! if(sName.length()<1){ ! String s = "tdSet" + i + "_Row" + j + "_name"; %> ! <tr> ! <td class="head" id="<%=s%>"><%=genText(s, "")%></td> ! <% }else{%> ! <tr> ! <td class="head"><%= sName %></td> ! <% } ! if(colCount>0){ ! int n=0; ! NodeList cells = row.getElementsByTagName("cell"); ! for(int k=1; k<colCount; k++){ ! Element cell = (Element)cells.item(n); ! if(cell != null){ ! if(String.valueOf(k).equals(cell.getAttribute("index"))){ ! String s = "tdSet" + i + "_Row" + j + "_Col" + k; %> ! <td class="normal" id="<%=s%>"> ! <%= genCell(s, cell, sName+" - "+((Element)columns.item(k-1)).getAttribute("name"))%> ! </td> ! <% n++; ! }else{ %> ! <td class="grey"> </td><% ! } ! }else{ %> ! <td class="grey"> </td> ! <%} } ! }else{ ! NodeList cells = row.getElementsByTagName("cell"); ! for(int k=0; k<cells.getLength(); k++){ ! Element cell = (Element)cells.item(k); ! if(cell.getAttribute("index").equals(String.valueOf(k+1))){ ! String s = "tdSet" + i + "_Row" + j + "_Col" + (k+1); %> ! <td id="<%=s%>"> ! <%= genCell(s, cell, "")%> ! </td> ! <%}else{%> ! <td class="grey"> </td> ! <%} } ! } ! String sID = "tdSet" + i + "_Row" + j + "_comments"; ! String sValue = ""; + NodeList comments = row.getElementsByTagName("comments"); + if(comments.getLength()>0){ + sValue = UtilXML.getText(comments.item(0)); + }%> + <td id="<%=sID%>"> + <%= genText(sID, sValue)%> + </td> + </tr> + <% + } %> </table> ! <%} } *************** *** 360,365 **** <%! ! String genText(String id, String value) ! { String s = "\n<span style='width:100%'>" + "<input type=text style='width:100%;' name='" --- 361,365 ---- <%! ! String genText(String id, String value){ String s = "\n<span style='width:100%'>" + "<input type=text style='width:100%;' name='" *************** *** 370,375 **** } ! String genCell(String id, Element cell, String colName) ! { String s = "\n<span style='width:100%'>"; --- 370,374 ---- } ! String genCell(String id, Element cell, String colName){ String s = "\n<span style='width:100%'>"; *************** *** 387,402 **** s += "<span id='" + id + "_label' style='font-size:8pt;width:75px'>"; ! if(givenDate.length()>0) ! { s += givenDate; ! } ! else ! { ! if(refusedDate.length()>0) ! { s += "Refused "+refusedDate; ! } ! else ! { s += " "; } --- 386,395 ---- s += "<span id='" + id + "_label' style='font-size:8pt;width:75px'>"; ! if(givenDate.length()>0){ s += givenDate; ! }else{ ! if(refusedDate.length()>0){ s += "Refused "+refusedDate; ! }else{ s += " "; } *************** *** 431,434 **** --- 424,430 ---- </td> <td> + <input type="button" value="Show All" onclick="formSubmit('ShowAll');" style="width:100px" /> + </td> + <td> <input type="button" value="<bean:message key="global.btnClose"/>" onclick="window.close();" style="width:100px" /> </td> |
