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: Ivy C. <ic...@us...> - 2005-01-11 17:51:22
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20214 Modified Files: formVTForm.jsp Log Message: removed the risk factore checkboxes hidden date Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** formVTForm.jsp 11 Jan 2005 16:28:08 -0000 1.23 --- formVTForm.jsp 11 Jan 2005 17:51:11 -0000 1.24 *************** *** 551,558 **** <html:hidden property="value(ACSValue)"/> <html:hidden property="value(RVTNValue)"/> ! <html:hidden property="value(MIDate)"/> ! <html:hidden property="value(AngDate)"/> ! <html:hidden property="value(ACSDate)"/> ! <html:hidden property="value(RVTNDate)"/> <td class="sixtyPercent"><html:checkbox property="value(DMValue)" onclick="javascript: DMCheck();"/> DM</td> <td class="sixtyPercent"><html:checkbox property="value(HTNValue)"/> HTN</td> --- 551,555 ---- <html:hidden property="value(ACSValue)"/> <html:hidden property="value(RVTNValue)"/> ! <td class="sixtyPercent"><html:checkbox property="value(DMValue)" onclick="javascript: DMCheck();"/> DM</td> <td class="sixtyPercent"><html:checkbox property="value(HTNValue)"/> HTN</td> *************** *** 561,570 **** <td class="sixtyPercent"><html:checkbox property="value(CVDValue)"/> CVD</td> <td class="sixtyPercent"><html:checkbox property="value(PVDValue)" onclick="javascript: PVDCheck();"/> PVD</td> ! <html:hidden property="value(DMDate)"/> ! <html:hidden property="value(HTNDate)"/> ! <html:hidden property="value(HchlDate)"/> ! <html:hidden property="value(CADDate)"/> ! <html:hidden property="value(CVDDate)"/> ! <html:hidden property="value(PVDDate)"/> </tr> </table> --- 558,562 ---- <td class="sixtyPercent"><html:checkbox property="value(CVDValue)"/> CVD</td> <td class="sixtyPercent"><html:checkbox property="value(PVDValue)" onclick="javascript: PVDCheck();"/> PVD</td> ! </tr> </table> |
|
From: Ivy C. <ic...@us...> - 2005-01-11 17:50:26
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19960 Modified Files: FrmFormAction.java Log Message: assigned undefined observationdate to today's date Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** FrmFormAction.java 11 Jan 2005 15:42:31 -0000 1.21 --- FrmFormAction.java 11 Jan 2005 17:50:04 -0000 1.22 *************** *** 87,90 **** --- 87,91 ---- String timeStamp = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),"yyyy-MM-dd hh:mm:ss"); String visitCod = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),"yyyyMMdd"); + String today = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),"yyyy-MM-dd"); System.out.println("current mem 2 "+currentMem()); *************** *** 120,124 **** String inputValue = (String) frm.getValue(mt.getType()+"Value"); String observationDate = (String) frm.getValue(mt.getType()+"Date"); ! //parse the checkbox value inputValue = parseCheckBoxValue(inputValue, validation.getName()); --- 121,128 ---- String inputValue = (String) frm.getValue(mt.getType()+"Value"); String observationDate = (String) frm.getValue(mt.getType()+"Date"); ! if(mt.getType().equalsIgnoreCase("DM") || mt.getType().equalsIgnoreCase("HTN") || mt.getType().equalsIgnoreCase("Hchl") || mt.getType().equalsIgnoreCase("CAD") || mt.getType().equalsIgnoreCase("CVD") || mt.getType().equalsIgnoreCase("PVD") || mt.getType().equalsIgnoreCase("MI") || mt.getType().equalsIgnoreCase("Ang") || mt.getType().equalsIgnoreCase("ACS") || mt.getType().equalsIgnoreCase("RVTN")){ ! observationDate = today; ! } ! //parse the checkbox value inputValue = parseCheckBoxValue(inputValue, validation.getName()); |
|
From: Ivy C. <ic...@us...> - 2005-01-11 16:28:22
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2871 Modified Files: formVTForm.jsp Log Message: updated DMCheck javascript function Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** formVTForm.jsp 11 Jan 2005 16:01:47 -0000 1.22 --- formVTForm.jsp 11 Jan 2005 16:28:08 -0000 1.23 *************** *** 475,478 **** --- 475,483 ---- if(document.forms[0].elements[DMValue].checked==false && document.forms[0].elements[PVDValue].checked==false){ disableFTExam(true); + } + else{ + disableFTExam(false); + } + if(document.forms[0].elements[DMValue].checked==false){ document.forms[0].elements[HbA1Value].disabled= true; document.forms[0].elements[HbA1Date].disabled= true; *************** *** 482,487 **** document.forms[0].elements[DMCCmt].disabled= true; } ! else{ ! disableFTExam(false); document.forms[0].elements[HbA1Value].disabled= false; document.forms[0].elements[HbA1Date].disabled= false; --- 487,491 ---- document.forms[0].elements[DMCCmt].disabled= true; } ! else{ document.forms[0].elements[HbA1Value].disabled= false; document.forms[0].elements[HbA1Date].disabled= false; |
|
From: Ivy C. <ic...@us...> - 2005-01-11 16:01:59
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29135 Modified Files: formVTForm.jsp Log Message: updated DMCheck and PVDCheck javascipt function Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** formVTForm.jsp 11 Jan 2005 15:05:57 -0000 1.21 --- formVTForm.jsp 11 Jan 2005 16:01:47 -0000 1.22 *************** *** 473,477 **** function DMCheck(){ ! if(document.forms[0].elements[DMValue].checked==false){ disableFTExam(true); document.forms[0].elements[HbA1Value].disabled= true; --- 473,477 ---- function DMCheck(){ ! if(document.forms[0].elements[DMValue].checked==false && document.forms[0].elements[PVDValue].checked==false){ disableFTExam(true); document.forms[0].elements[HbA1Value].disabled= true; *************** *** 494,498 **** function PVDCheck(){ ! if(document.forms[0].elements[PVDValue].checked==false){ disableFTExam(true); } --- 494,498 ---- function PVDCheck(){ ! if(document.forms[0].elements[DMValue].checked==false && document.forms[0].elements[PVDValue].checked==false){ disableFTExam(true); } |
|
From: Ivy C. <ic...@us...> - 2005-01-11 15:42:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24813 Modified Files: FrmFormAction.java Log Message: cleaned up the null pointer exception bug Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** FrmFormAction.java 6 Jan 2005 21:43:23 -0000 1.20 --- FrmFormAction.java 11 Jan 2005 15:42:31 -0000 1.21 *************** *** 73,77 **** boolean valid = true; System.out.println("FrmFormAction is called "+currentMem()); ! System.gc(); System.out.println("current mem 1 "+currentMem()); FrmFormForm frm = (FrmFormForm) form; --- 73,77 ---- boolean valid = true; System.out.println("FrmFormAction is called "+currentMem()); ! System.out.println("current mem 1 "+currentMem()); FrmFormForm frm = (FrmFormForm) form; *************** *** 170,176 **** //Write to Measurement Table ! System.out.println("exit "+submit+" inputValue "+inputValue); ! if(submit.equalsIgnoreCase("exit") && !inputValue.equalsIgnoreCase("")) //System.out.println("write to measurement table: " + mt.getType()); ! write2MeasurementTable(demographicNo, providerNo, mt, inputValue, observationDate, comments); //Store all input value as properties for saving to form table --- 170,178 ---- //Write to Measurement Table ! System.out.println("write2Measurement type: " + type + " inputValue: " + inputValue); ! if(inputValue!=null){ ! if(submit.equalsIgnoreCase("exit") && !inputValue.equalsIgnoreCase("")) //System.out.println("write to measurement table: " + mt.getType()); ! write2MeasurementTable(demographicNo, providerNo, mt, inputValue, observationDate, comments); ! } //Store all input value as properties for saving to form table *************** *** 179,183 **** if(lastDataEnteredDate!=null) props.setProperty(type+"LastDataEnteredDate", lastDataEnteredDate); ! System.out.println("type: " + type + " input: " + inputValue); props.setProperty(type+"Date", observationDate==null?dateEntered:observationDate); --- 181,185 ---- if(lastDataEnteredDate!=null) props.setProperty(type+"LastDataEnteredDate", lastDataEnteredDate); ! //System.out.println("type: " + type + " input: " + inputValue); props.setProperty(type+"Date", observationDate==null?dateEntered:observationDate); |
|
From: Ivy C. <ic...@us...> - 2005-01-11 15:09:21
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15273 Modified Files: ScatterPlotChartServlet.java Log Message: updated to plot only the last data on the same observation date show the x-axis interval in terms of day instead of test Index: ScatterPlotChartServlet.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil/ScatterPlotChartServlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ScatterPlotChartServlet.java 4 Mar 2004 22:04:13 -0000 1.2 --- ScatterPlotChartServlet.java 11 Jan 2005 15:09:05 -0000 1.3 *************** *** 41,44 **** --- 41,45 ---- import java.io.IOException; import java.lang.*; + import java.sql.Date; import java.sql.ResultSet; import java.sql.SQLException; *************** *** 111,117 **** ******************************************************************************************/ private ScatterPlotDataSeries createScatterPlotDataSeries(String demo, String type, String mInstrc) ! { ! ! double[] results = generateResult(demo, type, mInstrc); String chartTitle = type + "-" + mInstrc; ScatterPlotDataSet scatterPlotDataSet = new ScatterPlotDataSet( this.createScatterPlotProperties() ); --- 112,117 ---- ******************************************************************************************/ private ScatterPlotDataSeries createScatterPlotDataSeries(String demo, String type, String mInstrc) ! { ! long[][] results = generateResult(demo, type, mInstrc); String chartTitle = type + "-" + mInstrc; ScatterPlotDataSet scatterPlotDataSet = new ScatterPlotDataSet( this.createScatterPlotProperties() ); *************** *** 121,134 **** if (type.compareTo("BP")!=0){ ! Point2D.Double[] points = new Point2D.Double[ results.length ]; ! for( int x = 0; x < results.length; x++ ) { points[ x ] = ScatterPlotDataSet.createPoint2DDouble(); ! points[ x ].setLocation( x+1, results[x] ); } scatterPlotDataSet.addDataPoints( points, Color.red, chartTitle ); scatterPlotDataSeries = new ScatterPlotDataSeries( scatterPlotDataSet, ! "Test Performed", "Test Results", chartTitle); --- 121,135 ---- if (type.compareTo("BP")!=0){ ! Point2D.Double[] points = new Point2D.Double[ results[0].length ]; ! for( int x = 0; x < results[0].length; x++ ) { points[ x ] = ScatterPlotDataSet.createPoint2DDouble(); ! points[ x ].setLocation( results[0][x]-results[0][0], results[1][x] ); } + scatterPlotDataSet.addDataPoints( points, Color.red, chartTitle ); scatterPlotDataSeries = new ScatterPlotDataSeries( scatterPlotDataSet, ! "Day (note: only the last data on the same observation date is plotted)", "Test Results", chartTitle); *************** *** 147,154 **** { ! double[] results = generateResult(demo, type, mInstrc); DataSeries dataSeries = null; String chartTitle = type + "-" + mInstrc; ! String xAxisTitle= "Tests"; String yAxisTitle= "Hgmm"; --- 148,155 ---- { ! long[][] results = generateResult(demo, type, mInstrc); DataSeries dataSeries = null; String chartTitle = type + "-" + mInstrc; ! String xAxisTitle= "Tests (note: only the last data on the same observation date is plotted)"; String yAxisTitle= "Hgmm"; *************** *** 156,170 **** if (type.compareTo("BP")==0){ ! double[][] points = new double[2][results.length/2]; String[] legendLabels= { "Systolic", "Diastolic"}; Paint[] paints= {Color.red, Color.blue}; LineChartProperties lineChartProperties = this.createLineChartProperties(); ! int offset = results.length/2; String[] xAxisLabels= new String[offset]; ! for( int x = 0; x < results.length/2; x++ ) { ! System.out.println("systolic" + x + " " + results[x]); ! points[0][x] = results[x]; int testNum = x + 1; String xAxisLabel = "test" + testNum; --- 157,171 ---- if (type.compareTo("BP")==0){ ! double[][] points = new double[2][results[1].length/2]; String[] legendLabels= { "Systolic", "Diastolic"}; Paint[] paints= {Color.red, Color.blue}; LineChartProperties lineChartProperties = this.createLineChartProperties(); ! int offset = results[1].length/2; String[] xAxisLabels= new String[offset]; ! for( int x = 0; x < results[1].length/2; x++ ) { ! System.out.println("systolic" + x + " " + results[1][x]); ! points[0][x] = results[1][x]; int testNum = x + 1; String xAxisLabel = "test" + testNum; *************** *** 173,180 **** } ! for( int x = 0; x < results.length/2; x++ ) { ! System.out.println("Diastolic" + x + results[x+offset]); ! points[1][x] = results[x+offset]; } --- 174,181 ---- } ! for( int x = 0; x < results[1].length/2; x++ ) { ! System.out.println("Diastolic" + x + results[1][x+offset]); ! points[1][x] = results[1][x+offset]; } *************** *** 201,211 **** * @return DataSeries ******************************************************************************************/ ! private double[] generateResult(String demo, String type, String mInstrc){ ! double[] points = null; try{ if(isNumeric(type, mInstrc)){ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql = "SELECT * FROM measurements WHERE demographicNo = '" + demo + "' AND type='"+ type + "' AND measuringInstruction='" + mInstrc + "' ORDER BY dateObserved"; System.out.println("SQL Statement: " + sql); --- 202,214 ---- * @return DataSeries ******************************************************************************************/ ! private long[][] generateResult(String demo, String type, String mInstrc){ ! //plot only last data of the day?! ! long[][] points = null; ! try{ if(isNumeric(type, mInstrc)){ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql = "SELECT DISTINCT dateObserved FROM measurements WHERE demographicNo = '" + demo + "' AND type='"+ type + "' AND measuringInstruction='" + mInstrc + "' ORDER BY dateObserved"; System.out.println("SQL Statement: " + sql); *************** *** 213,222 **** rs = db.GetSQL(sql); rs.last(); ! int nbPatient = rs.getRow(); rs.first(); ! points = new double[nbPatient]; ! ! for(int i=0; i<nbPatient; i++){ ! points[i] = rs.getDouble("dataField"); rs.next(); } --- 216,235 ---- rs = db.GetSQL(sql); rs.last(); ! int nbData = rs.getRow(); rs.first(); ! points = new long[2][nbData]; ! ! for(int i=0; i<nbData; i++){ ! sql = "SELECT * FROM measurements WHERE demographicNo='" + demo + "' AND type='"+ type ! + "' AND dateObserved='"+rs.getString("dateObserved") + "' ORDER BY dateEntered DESC limit 1"; ! ResultSet rsData; ! rsData = db.GetSQL(sql); ! if(rsData.next()){ ! Date dateObserved = rs.getDate("dateObserved"); ! points[0][i] = dateObserved.getTime()/1000/60/60/24; ! points[1][i] = rsData.getLong("dataField"); ! System.out.println("Date: " + points[0][i] + " Value: " + points[1][i]); ! } ! rsData.close(); rs.next(); } *************** *** 226,259 **** else if (type.compareTo("BP")==0){ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql = "SELECT * FROM measurements WHERE demographicNo = '" + demo + "' AND type='"+ type + "' AND measuringInstruction='" + mInstrc ! + "' ORDER BY dateObserved"; System.out.println("SQL Statement: " + sql); ResultSet rs; rs = db.GetSQL(sql); ! rs.last(); int nbPatient = rs.getRow(); rs.first(); rs.previous(); ! points = new double[nbPatient*2]; boolean hasNext = true; ! System.out.println("size of array: " + points.length); ! for(int i=0; i<nbPatient; i++){ ! if(rs.next()){ ! String bloodPressure = rs.getString("dataField"); ! int slashIndex = bloodPressure.indexOf("/"); ! if (slashIndex >= 0){ ! String systolic = bloodPressure.substring(0, slashIndex); ! points[i] = Double.parseDouble(systolic); ! System.out.println("systolic: " + i + " " + systolic); ! String diastolic = bloodPressure.substring(slashIndex+1); ! points[i+nbPatient] = Double.parseDouble(diastolic); ! System.out.println("diastolic: " + points[i+nbPatient]); ! } } } ! for(int i=0; i<nbPatient; i++){ System.out.println("the result is: " + points[i]); ! } System.out.println("Store blood pressure data to a new array successfully" ); rs.close(); --- 239,285 ---- else if (type.compareTo("BP")==0){ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql = "SELECT dateObserved FROM measurements WHERE demographicNo = '" + demo + "' AND type='"+ type + "' AND measuringInstruction='" + mInstrc ! + "' GROUP BY dateObserved ORDER BY dateObserved"; System.out.println("SQL Statement: " + sql); ResultSet rs; rs = db.GetSQL(sql); ! rs.last(); int nbPatient = rs.getRow(); rs.first(); rs.previous(); ! points = new long[2][nbPatient*2]; ! boolean hasNext = true; ! System.out.println("number of record: " + Integer.toString(nbPatient)); ! for(int i=0; i<nbPatient; i++){ ! if(rs.next()){ ! sql = "SELECT * FROM measurements WHERE demographicNo='" + demo + "' AND type='"+ type ! + "' AND dateObserved='"+rs.getString("dateObserved") + "' ORDER BY dateEntered DESC limit 1"; ! System.out.println("sql dateObserved: " + sql); ! ResultSet rsData; ! rsData = db.GetSQL(sql); ! if(rsData.next()){ ! String bloodPressure = rsData.getString("dataField"); ! System.out.println("bloodPressure: " + bloodPressure); ! int slashIndex = bloodPressure.indexOf("/"); ! if (slashIndex >= 0){ ! String systolic = bloodPressure.substring(0, slashIndex); ! Date dateObserved = rs.getDate("dateObserved"); ! points[0][i] = dateObserved.getTime()/1000/60/60/24; ! points[1][i] = Long.parseLong(systolic); ! System.out.println("systolic: " + i + " " + systolic); ! String diastolic = bloodPressure.substring(slashIndex+1); ! points[0][i+nbPatient] = dateObserved.getTime()/1000/60/60/24; ! points[1][i+nbPatient] = Long.parseLong(diastolic); ! System.out.println("diastolic: " + points[1][i+nbPatient]); ! } ! } ! rsData.close(); } } ! /*for(int i=0; i<nbPatient; i++){ System.out.println("the result is: " + points[i]); ! }*/ System.out.println("Store blood pressure data to a new array successfully" ); rs.close(); |
|
From: Ivy C. <ic...@us...> - 2005-01-11 15:07:56
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14848 Modified Files: EctSetupDisplayHistoryAction.java Log Message: removed useless attribute Index: EctSetupDisplayHistoryAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil/EctSetupDisplayHistoryAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EctSetupDisplayHistoryAction.java 7 Jan 2005 21:47:11 -0000 1.6 --- EctSetupDisplayHistoryAction.java 11 Jan 2005 15:07:28 -0000 1.7 *************** *** 64,69 **** } HttpSession session = request.getSession(); ! session.setAttribute( "measurementsData", hd ); ! session.setAttribute( "back", "back" ); } else{ --- 64,68 ---- } HttpSession session = request.getSession(); ! session.setAttribute( "measurementsData", hd ); } else{ |
|
From: Ivy C. <ic...@us...> - 2005-01-11 15:06:38
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/bean In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14541 Modified Files: EctMeasurementsDataBeanHandler.java Log Message: updated get data query Index: EctMeasurementsDataBeanHandler.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/bean/EctMeasurementsDataBeanHandler.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** EctMeasurementsDataBeanHandler.java 7 Jan 2005 21:36:36 -0000 1.8 --- EctMeasurementsDataBeanHandler.java 11 Jan 2005 15:06:27 -0000 1.9 *************** *** 119,127 **** try { DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql ="SELECT m.id, mt.type, mt.typeDisplayName, mt.typeDescription, m.demographicNo, m.providerNo, m.dataField, mt.measuringInstruction,"+ "m.comments, m.dateObserved, m.dateEntered , p.first_name AS provider_first, p.last_name AS provider_last," + "v.isNumeric AS numericValidation, v.name AS validationName FROM measurements m, provider p, validations v," + "measurementType mt WHERE m.demographicNo='" + demo + "' AND m.type = '" + type + "' AND m.providerNo= p.provider_no " + ! "AND m.type = mt.type AND mt.measuringInstruction = m.measuringInstruction AND mt.validation = v.id ORDER BY m.type ASC," + "m.dateEntered DESC"; System.out.println("sql: " + sql); --- 119,127 ---- try { DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql ="SELECT m.id, mt.type, mt.typeDisplayName, mt.typeDescription, m.demographicNo, m.providerNo, m.dataField, m.measuringInstruction,"+ "m.comments, m.dateObserved, m.dateEntered , p.first_name AS provider_first, p.last_name AS provider_last," + "v.isNumeric AS numericValidation, v.name AS validationName FROM measurements m, provider p, validations v," + "measurementType mt WHERE m.demographicNo='" + demo + "' AND m.type = '" + type + "' AND m.providerNo= p.provider_no " + ! "AND m.type = mt.type AND mt.validation = v.id GROUP BY m.id ORDER BY m.type ASC," + "m.dateEntered DESC"; System.out.println("sql: " + sql); *************** *** 140,144 **** rs.getString("comments"), rs.getString("dateObserved"), rs.getString("dateEntered"), canPlot); ! measurementsDataVector.add(data); } --- 140,145 ---- rs.getString("comments"), rs.getString("dateObserved"), rs.getString("dateEntered"), canPlot); ! measurementsDataVector.add(data); ! } |
|
From: Ivy C. <ic...@us...> - 2005-01-11 15:06:09
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14372 Modified Files: formVTForm.jsp Log Message: added "draft" after the heading Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** formVTForm.jsp 7 Jan 2005 14:30:35 -0000 1.20 --- formVTForm.jsp 11 Jan 2005 15:05:57 -0000 1.21 *************** *** 39,43 **** <head> <title> ! Vascular Tracker </title> <style type="text/css"> --- 39,43 ---- <head> <title> ! Vascular Tracker (Draft) </title> <style type="text/css"> *************** *** 523,527 **** <tr> <td class="subject"> ! Vascular Data Entry Template <%=request.getAttribute("decisionSupportURL")==null?"(Miles server is not available)":""%> </td> </tr> --- 523,527 ---- <tr> <td class="subject"> ! Vascular Data Entry Template (draft) <%=request.getAttribute("decisionSupportURL")==null?"(Miles server is not available)":""%> </td> </tr> |
|
From: Ivy C. <ic...@us...> - 2005-01-10 22:33:38
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11384 Modified Files: HistoryIndex.jsp Log Message: removed redundant delete button Index: HistoryIndex.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/HistoryIndex.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HistoryIndex.jsp 7 Jan 2005 21:37:16 -0000 1.2 --- HistoryIndex.jsp 10 Jan 2005 22:33:28 -0000 1.3 *************** *** 75,83 **** <table> <tr> ! <logic:present name="messages"> ! <logic:iterate id="msg" name="messages"> ! <bean:write name="msg"/><br> ! </logic:iterate> ! </logic:present> </tr> <tr> --- 75,79 ---- <table> <tr> ! <th>Old Measurements Index</th> </tr> <tr> *************** *** 109,114 **** <tr> <td><input type="button" name="Button" value="<bean:message key="global.btnPrint"/>" onClick="window.print()"></td> ! <td><input type="button" name="Button" value="<bean:message key="global.btnClose"/>" onClick="window.close()"></td> ! <td><input type="button" name="Button" value="<bean:message key="oscarEncounter.oscarMeasurements.displayHistory.headingDelete"/>" onclick="submit();"/></td> <logic:present name="type"> <input type="hidden" name="type" value="<bean:write name="type" />"/> --- 105,109 ---- <tr> <td><input type="button" name="Button" value="<bean:message key="global.btnPrint"/>" onClick="window.print()"></td> ! <td><input type="button" name="Button" value="<bean:message key="global.btnClose"/>" onClick="window.close()"></td> <logic:present name="type"> <input type="hidden" name="type" value="<bean:write name="type" />"/> |
|
From: Ivy C. <ic...@us...> - 2005-01-10 22:33:13
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11238 Modified Files: DisplayHistory.jsp Log Message: updated back button Index: DisplayHistory.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/DisplayHistory.jsp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** DisplayHistory.jsp 7 Jan 2005 21:46:32 -0000 1.11 --- DisplayHistory.jsp 10 Jan 2005 22:33:03 -0000 1.12 *************** *** 84,93 **** <td> <tr> ! ! <th align="left" class="Header" width="5"> ! </th> ! <th align="left" class="Header" width="5"> ! <bean:message key="oscarEncounter.oscarMeasurements.displayHistory.headingType"/> ! </th> <th align="left" class="Header" width="20"> <bean:message key="oscarEncounter.oscarMeasurements.displayHistory.headingProvider"/> --- 84,99 ---- <td> <tr> ! <logic:present name="data" property="canPlot"> ! <th align="left" class="Header" width="5"> ! </th> ! <th align="left" class="Header" width="5"> ! <bean:message key="oscarEncounter.oscarMeasurements.displayHistory.headingType"/> ! </th> ! </logic:present> ! <logic:notPresent name="data" property="canPlot"> ! <th colspan="2" align="left" class="Header" width="5"> ! <bean:message key="oscarEncounter.oscarMeasurements.displayHistory.headingType"/> ! </th> ! </logic:notPresent> <th align="left" class="Header" width="20"> <bean:message key="oscarEncounter.oscarMeasurements.displayHistory.headingProvider"/> *************** *** 116,120 **** <tr class="data"> <td width="5"><img src="img/chart.gif" title="<bean:message key="oscarEncounter.oscarMeasurements.displayHistory.plot"/>" onclick="window.open('../../servlet/oscar.oscarEncounter.oscarMeasurements.pageUtil.ScatterPlotChartServlet?type=<bean:write name="data" property="type"/>&mInstrc=<bean:write name="data" property="measuringInstrc"/>')"/></td> ! <td width="5"><bean:write name="data" property="typeDisplayName" /></td> <td width="20"><bean:write name="data" property="providerFirstName" /> <bean:write name="data" property="providerLastName" /></td> <td width="200"><bean:write name="data" property="measuringInstrc" /></td> --- 122,126 ---- <tr class="data"> <td width="5"><img src="img/chart.gif" title="<bean:message key="oscarEncounter.oscarMeasurements.displayHistory.plot"/>" onclick="window.open('../../servlet/oscar.oscarEncounter.oscarMeasurements.pageUtil.ScatterPlotChartServlet?type=<bean:write name="data" property="type"/>&mInstrc=<bean:write name="data" property="measuringInstrc"/>')"/></td> ! <td width="5"><a title="<bean:write name="data" property="typeDescription" />"><bean:write name="data" property="type" /></a></td> <td width="20"><bean:write name="data" property="providerFirstName" /> <bean:write name="data" property="providerLastName" /></td> <td width="200"><bean:write name="data" property="measuringInstrc" /></td> *************** *** 127,133 **** </logic:present> <logic:notPresent name="data" property="canPlot"> ! <tr class="data"> ! <td width="5"></td> ! <td width="5"><bean:write name="data" property="typeDisplayName" /></td> <td width="20"><bean:write name="data" property="providerFirstName" /> <bean:write name="data" property="providerLastName" /></td> <td width="200"><bean:write name="data" property="measuringInstrc" /></td> --- 133,138 ---- </logic:present> <logic:notPresent name="data" property="canPlot"> ! <tr class="data"> ! <td width="5" colspan=2><a title="<bean:write name="data" property="typeDescription" />"><bean:write name="data" property="type" /></a></td> <td width="20"><bean:write name="data" property="providerFirstName" /> <bean:write name="data" property="providerLastName" /></td> <td width="200"><bean:write name="data" property="measuringInstrc" /></td> *************** *** 144,151 **** </table> <table> ! <tr> ! <logic:present name="back"> ! <td><input type="button" name="Button" value="<bean:message key="global.btnBack"/>" onClick="window.history.go(-1)"></td> ! </logic:present> <td><input type="button" name="Button" value="<bean:message key="global.btnPrint"/>" onClick="window.print()"></td> <td><input type="button" name="Button" value="<bean:message key="global.btnClose"/>" onClick="window.close()"></td> --- 149,154 ---- </table> <table> ! <tr> ! <td><input type="button" name="Button" value="List Old Measurements Index" onClick="javascript: popupPage(300,800,'SetupHistoryIndex.do')"></td> <td><input type="button" name="Button" value="<bean:message key="global.btnPrint"/>" onClick="window.print()"></td> <td><input type="button" name="Button" value="<bean:message key="global.btnClose"/>" onClick="window.close()"></td> |
|
From: Ivy C. <ic...@us...> - 2005-01-07 21:47:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21617 Modified Files: EctSetupDisplayHistoryAction.java Log Message: added "back" attribute Index: EctSetupDisplayHistoryAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil/EctSetupDisplayHistoryAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EctSetupDisplayHistoryAction.java 7 Jan 2005 21:24:45 -0000 1.5 --- EctSetupDisplayHistoryAction.java 7 Jan 2005 21:47:11 -0000 1.6 *************** *** 65,68 **** --- 65,69 ---- HttpSession session = request.getSession(); session.setAttribute( "measurementsData", hd ); + session.setAttribute( "back", "back" ); } else{ |
|
From: Ivy C. <ic...@us...> - 2005-01-07 21:46:41
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21440 Modified Files: DisplayHistory.jsp Log Message: updated back button javascript function Index: DisplayHistory.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/DisplayHistory.jsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** DisplayHistory.jsp 7 Jan 2005 21:22:07 -0000 1.10 --- DisplayHistory.jsp 7 Jan 2005 21:46:32 -0000 1.11 *************** *** 145,149 **** <table> <tr> ! <td><input type="button" name="Button" value="<bean:message key="global.btnBack"/>" onClick="window.back()"></td> <td><input type="button" name="Button" value="<bean:message key="global.btnPrint"/>" onClick="window.print()"></td> <td><input type="button" name="Button" value="<bean:message key="global.btnClose"/>" onClick="window.close()"></td> --- 145,151 ---- <table> <tr> ! <logic:present name="back"> ! <td><input type="button" name="Button" value="<bean:message key="global.btnBack"/>" onClick="window.history.go(-1)"></td> ! </logic:present> <td><input type="button" name="Button" value="<bean:message key="global.btnPrint"/>" onClick="window.print()"></td> <td><input type="button" name="Button" value="<bean:message key="global.btnClose"/>" onClick="window.close()"></td> |
|
From: Ivy C. <ic...@us...> - 2005-01-07 21:37:25
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19459 Modified Files: HistoryIndex.jsp Log Message: removed measuring instruction column Index: HistoryIndex.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/HistoryIndex.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HistoryIndex.jsp 7 Jan 2005 21:25:40 -0000 1.1 --- HistoryIndex.jsp 7 Jan 2005 21:37:16 -0000 1.2 *************** *** 89,96 **** <th align="left" class="Header" width="200"> Type Description ! </th> ! <th align="left" class="Header" width="200"> ! <bean:message key="oscarEncounter.oscarMeasurements.displayHistory.headingMeasuringInstruction"/> ! </th> <th align="left" class="Header" width="50"> --- 89,93 ---- <th align="left" class="Header" width="200"> Type Description ! </th> <th align="left" class="Header" width="50"> *************** *** 101,106 **** <tr class="data"> <td width="20"><bean:write name="data" property="type" /></td> ! <td width="200"><bean:write name="data" property="typeDescription" /></td> ! <td width="200"><bean:write name="data" property="measuringInstrc" /></td> <td width="50"><a href="#" name='<bean:message key="oscarEncounter.Index.oldMeasurements"/>' onClick="popupPage(300,800,'SetupDisplayHistory.do?type=<bean:write name="data" property="type" />'); return false;">more...</a></td> </tr> --- 98,102 ---- <tr class="data"> <td width="20"><bean:write name="data" property="type" /></td> ! <td width="200"><bean:write name="data" property="typeDescription" /></td> <td width="50"><a href="#" name='<bean:message key="oscarEncounter.Index.oldMeasurements"/>' onClick="popupPage(300,800,'SetupDisplayHistory.do?type=<bean:write name="data" property="type" />'); return false;">more...</a></td> </tr> |
|
From: Ivy C. <ic...@us...> - 2005-01-07 21:36:45
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/bean In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19219 Modified Files: EctMeasurementsDataBeanHandler.java Log Message: group the history index by measurement type instead of id Index: EctMeasurementsDataBeanHandler.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/bean/EctMeasurementsDataBeanHandler.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** EctMeasurementsDataBeanHandler.java 7 Jan 2005 21:21:36 -0000 1.7 --- EctMeasurementsDataBeanHandler.java 7 Jan 2005 21:36:36 -0000 1.8 *************** *** 89,93 **** String sql ="SELECT mt.type, mt.typeDisplayName, mt.typeDescription, mt.measuringInstruction FROM measurements m," + "measurementType mt WHERE m.demographicNo='" + demo + "' AND m.type = mt.type " + ! "GROUP BY mt.id ORDER BY m.type ASC"; System.out.println(" EctMeasurementDataBeanHandler sql: " + sql); --- 89,93 ---- String sql ="SELECT mt.type, mt.typeDisplayName, mt.typeDescription, mt.measuringInstruction FROM measurements m," + "measurementType mt WHERE m.demographicNo='" + demo + "' AND m.type = mt.type " + ! "GROUP BY mt.type ORDER BY m.type ASC"; System.out.println(" EctMeasurementDataBeanHandler sql: " + sql); *************** *** 119,123 **** try { DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql ="SELECT m.id, mt.type, mt.typeDisplayName, mt.typeDescription, m.demographicNo, m.providerNo, m.dataField, m.measuringInstruction,"+ "m.comments, m.dateObserved, m.dateEntered , p.first_name AS provider_first, p.last_name AS provider_last," + "v.isNumeric AS numericValidation, v.name AS validationName FROM measurements m, provider p, validations v," + --- 119,123 ---- try { DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql ="SELECT m.id, mt.type, mt.typeDisplayName, mt.typeDescription, m.demographicNo, m.providerNo, m.dataField, mt.measuringInstruction,"+ "m.comments, m.dateObserved, m.dateEntered , p.first_name AS provider_first, p.last_name AS provider_last," + "v.isNumeric AS numericValidation, v.name AS validationName FROM measurements m, provider p, validations v," + |
|
From: Ivy C. <ic...@us...> - 2005-01-07 21:25:50
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16513 Added Files: HistoryIndex.jsp Log Message: initial commit --- NEW FILE: HistoryIndex.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 language="java" %> <%@ 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" %> <%@ page import="oscar.oscarEncounter.pageUtil.*"%> <%@ page import="oscar.oscarEncounter.oscarMeasurements.pageUtil.*"%> <%@ page import="oscar.oscarEncounter.oscarMeasurements.bean.*"%> <%@ page import="java.util.Vector"%> <% 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> <bean:message key="oscarEncounter.Index.oldMeasurements"/> </title> <html:base/> </head> <link rel="stylesheet" type="text/css" href="../encounterStyles.css"> <script type="text/javascript" language=javascript> function popupPage(vheight,vwidth,varpage) { //open a new popup window var page = "" + varpage; windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=600,screenY=200,top=0,left=0"; var popup=window.open(page, "<bean:message key="oscarEncounter.Index.popupPageWindow"/>", windowprops); if (popup != null) { if (popup.opener == null) { popup.opener = self; alert("<bean:message key="oscarEncounter.Index.popupPageAlert"/>"); } } } </script> <body topmargin="0" leftmargin="0" vlink="#0000FF" onload="window.focus();"> <html:errors/> <html:form action="/oscarEncounter/oscarMeasurements/DeleteData"> <table> <tr> <td> <table> <tr> <logic:present name="messages"> <logic:iterate id="msg" name="messages"> <bean:write name="msg"/><br> </logic:iterate> </logic:present> </tr> <tr> <td> <tr> <th align="left" class="Header" width="20"> <bean:message key="oscarEncounter.oscarMeasurements.displayHistory.headingType"/> </th> <th align="left" class="Header" width="200"> Type Description </th> <th align="left" class="Header" width="200"> <bean:message key="oscarEncounter.oscarMeasurements.displayHistory.headingMeasuringInstruction"/> </th> <th align="left" class="Header" width="50"> </th> </tr> <logic:present name="measurementsData"> <logic:iterate id="data" name="measurementsData" property="measurementsDataVector" indexId = "ctr" > <tr class="data"> <td width="20"><bean:write name="data" property="type" /></td> <td width="200"><bean:write name="data" property="typeDescription" /></td> <td width="200"><bean:write name="data" property="measuringInstrc" /></td> <td width="50"><a href="#" name='<bean:message key="oscarEncounter.Index.oldMeasurements"/>' onClick="popupPage(300,800,'SetupDisplayHistory.do?type=<bean:write name="data" property="type" />'); return false;">more...</a></td> </tr> </logic:iterate> </logic:present> </td> </tr> </table> <table> <tr> <td><input type="button" name="Button" value="<bean:message key="global.btnPrint"/>" onClick="window.print()"></td> <td><input type="button" name="Button" value="<bean:message key="global.btnClose"/>" onClick="window.close()"></td> <td><input type="button" name="Button" value="<bean:message key="oscarEncounter.oscarMeasurements.displayHistory.headingDelete"/>" onclick="submit();"/></td> <logic:present name="type"> <input type="hidden" name="type" value="<bean:write name="type" />"/> </logic:present> </tr> </table> </td> </tr> </table> </html:form> </body> </html:html> |
|
From: Ivy C. <ic...@us...> - 2005-01-07 21:25:08
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16277 Modified Files: EctSetupDisplayHistoryAction.java Log Message: only handle measurements data with specific type Index: EctSetupDisplayHistoryAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil/EctSetupDisplayHistoryAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EctSetupDisplayHistoryAction.java 30 Mar 2004 19:41:59 -0000 1.4 --- EctSetupDisplayHistoryAction.java 7 Jan 2005 21:24:45 -0000 1.5 *************** *** 62,69 **** hd = new oscar.oscarEncounter.oscarMeasurements.bean.EctMeasurementsDataBeanHandler(demo, type); request.setAttribute("type", type); ! } ! else{ ! hd = new oscar.oscarEncounter.oscarMeasurements.bean.EctMeasurementsDataBeanHandler(demo); ! } HttpSession session = request.getSession(); session.setAttribute( "measurementsData", hd ); --- 62,66 ---- hd = new oscar.oscarEncounter.oscarMeasurements.bean.EctMeasurementsDataBeanHandler(demo, type); request.setAttribute("type", type); ! } HttpSession session = request.getSession(); session.setAttribute( "measurementsData", hd ); |
|
From: Ivy C. <ic...@us...> - 2005-01-07 21:23:41
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15834 Added Files: EctSetupHistoryIndexAction.java Log Message: initial commit --- NEW FILE: EctSetupHistoryIndexAction.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. * // * // * <OSCAR TEAM> // * This software was written for the // * Department of Family Medicine // * McMaster Unviersity // * Hamilton // * Ontario, Canada // * // ----------------------------------------------------------------------------------------------------------------------- package oscar.oscarEncounter.oscarMeasurements.pageUtil; import java.io.*; import java.util.*; import java.lang.*; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.http.*; import org.apache.struts.action.*; import org.apache.struts.validator.*; import org.apache.commons.validator.*; import org.apache.struts.util.MessageResources; import oscar.oscarDB.DBHandler; import oscar.oscarMessenger.util.MsgStringQuote; import oscar.oscarEncounter.pageUtil.EctSessionBean; import oscar.OscarProperties; import oscar.oscarEncounter.oscarMeasurements.bean.*; public final class EctSetupHistoryIndexAction extends Action { public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { EctSessionBean bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean"); request.getSession().setAttribute("EctSessionBean", bean); if (bean!=null){ String demo = (String) bean.getDemographicNo(); oscar.oscarEncounter.oscarMeasurements.bean.EctMeasurementsDataBeanHandler hd = new oscar.oscarEncounter.oscarMeasurements.bean.EctMeasurementsDataBeanHandler(demo); HttpSession session = request.getSession(); session.setAttribute( "measurementsData", hd ); } else{ System.out.println("cannot get the EctSessionBean"); } return (mapping.findForward("continue")); } } |
|
From: Ivy C. <ic...@us...> - 2005-01-07 21:22:40
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15412 Modified Files: DisplayHistory.jsp Log Message: updated back button onclick function Index: DisplayHistory.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/DisplayHistory.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DisplayHistory.jsp 16 Apr 2004 18:02:08 -0000 1.9 --- DisplayHistory.jsp 7 Jan 2005 21:22:07 -0000 1.10 *************** *** 54,57 **** --- 54,70 ---- <link rel="stylesheet" type="text/css" href="../encounterStyles.css"> + <script type="text/javascript" language=javascript> + function popupPage(vheight,vwidth,varpage) { //open a new popup window + var page = "" + varpage; + windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=600,screenY=200,top=0,left=0"; + var popup=window.open(page, "<bean:message key="oscarEncounter.Index.popupPageWindow"/>", windowprops); + if (popup != null) { + if (popup.opener == null) { + popup.opener = self; + alert("<bean:message key="oscarEncounter.Index.popupPageAlert"/>"); + } + } + } + </script> <body topmargin="0" leftmargin="0" vlink="#0000FF" onload="window.focus();"> <html:errors/> *************** *** 132,135 **** --- 145,149 ---- <table> <tr> + <td><input type="button" name="Button" value="<bean:message key="global.btnBack"/>" onClick="window.back()"></td> <td><input type="button" name="Button" value="<bean:message key="global.btnPrint"/>" onClick="window.print()"></td> <td><input type="button" name="Button" value="<bean:message key="global.btnClose"/>" onClick="window.close()"></td> |
|
From: Ivy C. <ic...@us...> - 2005-01-07 21:21:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/bean In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15186 Modified Files: EctMeasurementsDataBeanHandler.java Log Message: updated mysql query Index: EctMeasurementsDataBeanHandler.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/bean/EctMeasurementsDataBeanHandler.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EctMeasurementsDataBeanHandler.java 16 Apr 2004 17:54:56 -0000 1.6 --- EctMeasurementsDataBeanHandler.java 7 Jan 2005 21:21:36 -0000 1.7 *************** *** 44,48 **** } ! public boolean init(String demo) { boolean verdict = true; try { --- 44,48 ---- } ! /*public boolean init(String demo) { boolean verdict = true; try { *************** *** 54,58 **** "AND mt.measuringInstruction = m.measuringInstruction AND mt.validation = v.id ORDER BY m.type ASC," + "m.dateEntered DESC"; ! System.out.println("sql: " + sql); ResultSet rs; String canPlot = null; --- 54,59 ---- "AND mt.measuringInstruction = m.measuringInstruction AND mt.validation = v.id ORDER BY m.type ASC," + "m.dateEntered DESC"; ! ! System.out.println(" EctMeasurementDataBeanHandler sql: " + sql); ResultSet rs; String canPlot = null; *************** *** 80,85 **** } return verdict; ! } public boolean init(String demo, String type) { --- 81,117 ---- } return verdict; ! }*/ ! ! public boolean init(String demo) { ! boolean verdict = true; ! try { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql ="SELECT mt.type, mt.typeDisplayName, mt.typeDescription, mt.measuringInstruction FROM measurements m," + ! "measurementType mt WHERE m.demographicNo='" + demo + "' AND m.type = mt.type " + ! "GROUP BY mt.id ORDER BY m.type ASC"; ! ! System.out.println(" EctMeasurementDataBeanHandler sql: " + sql); ! ResultSet rs; ! String canPlot = null; ! for(rs = db.GetSQL(sql); rs.next(); ) ! { ! EctMeasurementsDataBean data = new EctMeasurementsDataBean(); ! data.setType(rs.getString("type")); ! data.setTypeDisplayName(rs.getString("typeDisplayName")); ! data.setTypeDescription(rs.getString("typeDescription")); ! data.setMeasuringInstrc(rs.getString("measuringInstruction")); ! //System.out.println("Measurments: " + rs.getString("type") + " " + rs.getString("typeDisplayName") + " " + rs.getString("typeDescription")); ! measurementsDataVector.add(data); ! } + rs.close(); + db.CloseConn(); + } + catch(SQLException e) { + System.out.println(e.getMessage()); + verdict = false; + } + return verdict; + } public boolean init(String demo, String type) { *************** *** 87,91 **** try { DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql ="SELECT m.id, mt.type, mt.typeDisplayName, m.demographicNo, m.providerNo, m.dataField, m.measuringInstruction,"+ "m.comments, m.dateObserved, m.dateEntered , p.first_name AS provider_first, p.last_name AS provider_last," + "v.isNumeric AS numericValidation, v.name AS validationName FROM measurements m, provider p, validations v," + --- 119,123 ---- try { DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql ="SELECT m.id, mt.type, mt.typeDisplayName, mt.typeDescription, m.demographicNo, m.providerNo, m.dataField, m.measuringInstruction,"+ "m.comments, m.dateObserved, m.dateEntered , p.first_name AS provider_first, p.last_name AS provider_last," + "v.isNumeric AS numericValidation, v.name AS validationName FROM measurements m, provider p, validations v," + *************** *** 103,107 **** canPlot = null; //System.out.println("canPlot value: " + canPlot); ! EctMeasurementsDataBean data = new EctMeasurementsDataBean(rs.getInt("id"), rs.getString("type"), rs.getString("typeDisplayName"), rs.getString("demographicNo"), rs.getString("provider_first"), rs.getString("provider_last"), rs.getString("dataField"), rs.getString("measuringInstruction"), --- 135,139 ---- canPlot = null; //System.out.println("canPlot value: " + canPlot); ! EctMeasurementsDataBean data = new EctMeasurementsDataBean(rs.getInt("id"), rs.getString("type"), rs.getString("typeDisplayName"), rs.getString("typeDescription"), rs.getString("demographicNo"), rs.getString("provider_first"), rs.getString("provider_last"), rs.getString("dataField"), rs.getString("measuringInstruction"), |
|
From: Ivy C. <ic...@us...> - 2005-01-07 21:01:52
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/bean In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11065 Modified Files: EctMeasurementsDataBean.java Log Message: updated init(String demo) Index: EctMeasurementsDataBean.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/bean/EctMeasurementsDataBean.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EctMeasurementsDataBean.java 16 Apr 2004 17:54:56 -0000 1.5 --- EctMeasurementsDataBean.java 7 Jan 2005 21:01:43 -0000 1.6 *************** *** 36,39 **** --- 36,40 ---- String type = ""; String typeDisplayName = ""; + String typeDescription = ""; String demo = ""; String providerFirstName = ""; *************** *** 49,53 **** } ! public EctMeasurementsDataBean(int id, String type, String typeDisplayName, String demo, String providerFirstName, String providerLastName, String dataField, String measuringInstrc, String comments, String dateObserved, String dateEntered, String canPlot){ --- 50,54 ---- } ! public EctMeasurementsDataBean(int id, String type, String typeDisplayName, String typeDescription, String demo, String providerFirstName, String providerLastName, String dataField, String measuringInstrc, String comments, String dateObserved, String dateEntered, String canPlot){ *************** *** 55,58 **** --- 56,60 ---- this.type = type; this.typeDisplayName = typeDisplayName; + this.typeDescription = typeDescription; this.demo = demo; this.providerFirstName = providerFirstName; *************** *** 75,78 **** --- 77,83 ---- return typeDisplayName; } + public String getTypeDescription(){ + return typeDescription; + } public String getDemo(){ return demo; *************** *** 113,116 **** --- 118,124 ---- public void setTypeDisplayName(String typeDisplayName){ this.typeDisplayName = typeDisplayName; + } + public void setTypeDescription(String typeDescription){ + this.typeDescription = typeDescription; } public void setDemo(String demo){ |
|
From: Ivy C. <ic...@us...> - 2005-01-07 21:01:35
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10990 Modified Files: struts-config.xml Log Message: added setupHistoryIndex action Index: struts-config.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/struts-config.xml,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** struts-config.xml 26 Nov 2004 20:13:43 -0000 1.58 --- struts-config.xml 7 Jan 2005 21:01:24 -0000 1.59 *************** *** 370,374 **** <!-- OscarWaitingList start--> <form-bean name="WLWaitingListForm" ! type="oscar.oscarWaitingList.pageUtil.WLWaitingListForm"/> <!-- OscarWaitingList stop--> </form-beans> --- 370,374 ---- <!-- OscarWaitingList start--> <form-bean name="WLWaitingListForm" ! type="oscar.oscarWaitingList.pageUtil.WLWaitingListForm"/> <!-- OscarWaitingList stop--> </form-beans> *************** *** 751,763 **** type="oscar.form.pageUtil.FrmSetupFormAction" name="FrmFormForm" ! scope="request"> ! <forward name="continue" path="/form/formVT.jsp"/> </action> <action path="/form/SubmitForm" type="oscar.form.pageUtil.FrmFormAction" name="FrmFormForm" ! scope="request"> ! <forward name="success" path="/form/formVT2OSDSF.jsp"/> ! <forward name="failure" path="/form/formVT.jsp" /> </action> --- 751,760 ---- type="oscar.form.pageUtil.FrmSetupFormAction" name="FrmFormForm" ! scope="request"> </action> <action path="/form/SubmitForm" type="oscar.form.pageUtil.FrmFormAction" name="FrmFormForm" ! scope="request"> </action> *************** *** 1175,1178 **** --- 1172,1180 ---- scope="request"> <forward name="continue" path="/oscarEncounter/oscarMeasurements/DisplayHistory.jsp"/> + </action> + <action path="/oscarEncounter/oscarMeasurements/SetupHistoryIndex" + type="oscar.oscarEncounter.oscarMeasurements.pageUtil.EctSetupHistoryIndexAction" + scope="request"> + <forward name="continue" path="/oscarEncounter/oscarMeasurements/HistoryIndex.jsp"/> </action> <action path="/oscarEncounter/oscarMeasurements/DeleteData" *************** *** 1774,1778 **** input="/oscarWaitingList/WLDisplayPatientWaitingList.jsp"> <forward name="success" path="/oscarWaitingList/WLDisplayPatientWaitingList.jsp"/> ! </action> <!-- oscarWaitingList end --> <!--PDF Label Printing --> --- 1776,1780 ---- input="/oscarWaitingList/WLDisplayPatientWaitingList.jsp"> <forward name="success" path="/oscarWaitingList/WLDisplayPatientWaitingList.jsp"/> ! </action> <!-- oscarWaitingList end --> <!--PDF Label Printing --> |
|
From: Ivy C. <ic...@us...> - 2005-01-07 20:47:55
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7528 Modified Files: Index.jsp Log Message: updated old measurement link Index: Index.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/Index.jsp,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** Index.jsp 23 Dec 2004 23:25:25 -0000 1.69 --- Index.jsp 7 Jan 2005 20:47:45 -0000 1.70 *************** *** 763,767 **** </tr> <tr> ! <td><a href=# onClick="popupPage(600,1000,'<rewrite:reWrite jspPage="oscarMeasurements/SetupDisplayHistory.do"/>'); return false;" ><bean:message key="oscarEncounter.Index.oldMeasurements"/></a> </td> </tr> --- 763,767 ---- </tr> <tr> ! <td><a href=# onClick="popupPage(600,1000,'<rewrite:reWrite jspPage="oscarMeasurements/SetupHistoryIndex.do"/>'); return false;" ><bean:message key="oscarEncounter.Index.oldMeasurements"/></a> </td> </tr> |
|
From: Ivy C. <ic...@us...> - 2005-01-07 14:30:45
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16610 Modified Files: formVTForm.jsp Log Message: fixed the eye and foot exam java script bug Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** formVTForm.jsp 6 Jan 2005 21:42:10 -0000 1.19 --- formVTForm.jsp 7 Jan 2005 14:30:35 -0000 1.20 *************** *** 262,272 **** function storeFTExamSupportData(){ ! 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; --- 262,272 ---- function storeFTExamSupportData(){ ! document.forms[0].elements[ftNoDate].value = document.getElementById('FTDate').value; ! document.forms[0].elements[ftNeDate].value = document.getElementById('FTDate').value; ! document.forms[0].elements[ftIsDate].value = document.getElementById('FTDate').value; ! document.forms[0].elements[ftUlDate].value = document.getElementById('FTDate').value; ! document.forms[0].elements[ftInDate].value = document.getElementById('FTDate').value; ! document.forms[0].elements[ftOtDate].value = document.getElementById('FTDate').value; ! document.forms[0].elements[ftReDate].value = document.getElementById('FTDate').value; document.forms[0].elements[ftNoCmt].value = document.forms[0].FTComments.value; *************** *** 320,328 **** function storeEyeExamSupportData(){ ! 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; --- 320,328 ---- function storeEyeExamSupportData(){ ! document.forms[0].elements[eyeNoDate].value = document.forms[0].iDate.value; ! document.forms[0].elements[eyeHypDate].value = document.forms[0].iDate.value; ! document.forms[0].elements[eyeDiaDate].value = document.forms[0].iDate.value; ! document.forms[0].elements[eyeOthDate].value = document.forms[0].iDate.value; ! document.forms[0].elements[eyeRefDate].value = document.forms[0].iDate.value; document.forms[0].elements[eyeNoCmt].value = document.forms[0].iComments.value; |
|
From: Ivy C. <ic...@us...> - 2005-01-06 21:46:01
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22950 Modified Files: oscarinit.sql Log Message: updated formVTForm table Index: oscarinit.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** oscarinit.sql 10 Dec 2004 19:10:26 -0000 1.65 --- oscarinit.sql 6 Jan 2005 21:45:51 -0000 1.66 *************** *** 4672,4675 **** --- 4672,4680 ---- WTLastData varchar(10), WTLastDataEnteredDate varchar(10), + WHRValue varchar(10), + WHRDate varchar(10), + WHRComments varchar(255), + WHRLastData varchar(10), + WHRLastDataEnteredDate varchar(10), WCValue varchar(10), WCDate varchar(10), *************** *** 4882,4886 **** OthCLastData varchar(10), OthCLastDataEnteredDate varchar(10), ! PRIMARY KEY (ID), INDEX (ID), --- 4887,4901 ---- OthCLastData varchar(10), OthCLastDataEnteredDate varchar(10), ! DMValue varchar(10), ! HTNValue varchar(10), ! HchlValue varchar(10), ! CADValue varchar(10), ! CVDValue varchar(10), ! PVDValue varchar(10), ! Diagnosis Text, ! Subjective Text, ! Objective Text, ! Assessment Text, ! Plan Text, PRIMARY KEY (ID), INDEX (ID), *************** *** 4890,4893 **** --- 4905,4910 ---- + + -- -- Table structure for table `groupMembers_tbl` |
