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: jai <yg...@us...> - 2010-11-15 21:09:05
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2236 Modified Files: Tag: RELEASE_10_06 Index.jsp Log Message: - ID: 3109766 -escape patient's name Index: Index.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS/Index.jsp,v retrieving revision 1.41.2.13 retrieving revision 1.41.2.14 diff -C2 -d -r1.41.2.13 -r1.41.2.14 *** Index.jsp 6 Nov 2010 19:35:11 -0000 1.41.2.13 --- Index.jsp 15 Nov 2010 21:08:57 -0000 1.41.2.14 *************** *** 33,37 **** <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%> <%@page import="org.oscarehr.common.hl7.v2.oscar_to_oscar.OscarToOscarUtils"%> ! <%@page import="org.oscarehr.util.MiscUtils"%> <% --- 33,37 ---- <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%> <%@page import="org.oscarehr.common.hl7.v2.oscar_to_oscar.OscarToOscarUtils"%> ! <%@page import="org.oscarehr.util.MiscUtils, org.apache.commons.lang.StringEscapeUtils"%> <% *************** *** 137,141 **** var docType=initDocType('<%=docType%>'); //{357=DOC, 38=HL7, 317=DOC, 316=DOC, 33=HL7, 30=HL7, 28=HL7} var patientDocs=initPatientDocs('<%=patientDocs%>');//{2=[316, 30, 28], 1=[33], -1=[357, 317, 38]} ! var patientIdNames=initPatientIdNames('<%=patientIdNamesStr%>');//;2=TEST2, PATIENT2;1=Zrrr, Srrr;-1=Not, Assigned //var patientIdStr='<%=patientIdStr%>';//2,1,-1, var docStatus=initDocStatus('<%=docStatus%>');//{357=A, 38=N, 317=A, 316=A, 33=N, 30=N, 28=N} --- 137,141 ---- var docType=initDocType('<%=docType%>'); //{357=DOC, 38=HL7, 317=DOC, 316=DOC, 33=HL7, 30=HL7, 28=HL7} var patientDocs=initPatientDocs('<%=patientDocs%>');//{2=[316, 30, 28], 1=[33], -1=[357, 317, 38]} ! var patientIdNames=initPatientIdNames('<%=StringEscapeUtils.escapeJavaScript(patientIdNamesStr)%>');//;2=TEST2, PATIENT2;1=Zrrr, Srrr;-1=Not, Assigned //var patientIdStr='<%=patientIdStr%>';//2,1,-1, var docStatus=initDocStatus('<%=docStatus%>');//{357=A, 38=N, 317=A, 316=A, 33=N, 30=N, 28=N} |
|
From: jai <yg...@us...> - 2010-11-15 15:18:39
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24651 Modified Files: Tag: RELEASE_10_06 oscarinit.sql Log Message: - ID: 3109574 -add status char(1) to queue_document_link table Index: oscarinit.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v retrieving revision 1.256.2.2 retrieving revision 1.256.2.3 diff -C2 -d -r1.256.2.2 -r1.256.2.3 *** oscarinit.sql 3 Aug 2010 22:52:31 -0000 1.256.2.2 --- oscarinit.sql 15 Nov 2010 15:18:31 -0000 1.256.2.3 *************** *** 8010,8013 **** --- 8010,8014 ---- queue_id int(10) not null, document_id int(10) not null, + status char(1), primary key (id) ); |
|
From: jai <yg...@us...> - 2010-11-15 15:18:19
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24457 Modified Files: Tag: RELEASE_10_06 oscardata.sql Log Message: - ID: 3109574 -remove insert into secObjectName values('_queue.1','default',0); insert into queue values(1,'default'); Index: oscardata.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscardata.sql,v retrieving revision 1.97.2.3 retrieving revision 1.97.2.4 diff -C2 -d -r1.97.2.3 -r1.97.2.4 *** oscardata.sql 1 Oct 2010 17:19:38 -0000 1.97.2.3 --- oscardata.sql 15 Nov 2010 15:18:11 -0000 1.97.2.4 *************** *** 1272,1277 **** INSERT INTO validations(name, maxValue, minValue, maxLength) values( 'Integer: 1 to 3', 3, 1, 1); - insert into queue values(1,'default'); - insert into `secRole` values(1, 'receptionist', 'receptionist'); insert into `secRole` values(2, 'doctor', 'doctor'); --- 1272,1275 ---- *************** *** 1363,1367 **** insert into `secObjectName` (`objectName`) values ('_newCasemgmt.templates'); insert into `secObjectName` (`objectName`) values ('_newCasemgmt.cpp'); - insert into secObjectName values('_queue.1','default',0); --- 1361,1364 ---- |
|
From: jai <yg...@us...> - 2010-11-15 15:07:29
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18240 Modified Files: oscarinit.sql Log Message: - ID: 3109574 -add status char(1) to queue_document_link table Index: oscarinit.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v retrieving revision 1.269 retrieving revision 1.270 diff -C2 -d -r1.269 -r1.270 *** oscarinit.sql 12 Nov 2010 20:38:45 -0000 1.269 --- oscarinit.sql 15 Nov 2010 15:07:21 -0000 1.270 *************** *** 8015,8018 **** --- 8015,8019 ---- queue_id int(10) not null, document_id int(10) not null, + status char(1) , primary key (id) ); |
|
From: jai <yg...@us...> - 2010-11-15 15:00:24
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14356 Modified Files: oscardata.sql Log Message: oscardata.sql - ID: 3109574 -remove insert into secObjectName values('_queue.1','default',0); insert into queue values(1,'default'); Index: oscardata.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscardata.sql,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** oscardata.sql 5 Nov 2010 17:46:18 -0000 1.106 --- oscardata.sql 15 Nov 2010 15:00:16 -0000 1.107 *************** *** 1214,1218 **** INSERT INTO validations(name, maxValue, minValue, maxLength) values( 'Integer: 1 to 3', 3, 1, 1); ! insert into queue values(1,'default'); insert into `secRole` values(1, 'receptionist', 'receptionist'); --- 1214,1218 ---- INSERT INTO validations(name, maxValue, minValue, maxLength) values( 'Integer: 1 to 3', 3, 1, 1); ! insert into `secRole` values(1, 'receptionist', 'receptionist'); *************** *** 1305,1309 **** insert into `secObjectName` (`objectName`) values ('_newCasemgmt.templates'); insert into `secObjectName` (`objectName`) values ('_newCasemgmt.cpp'); - insert into secObjectName values('_queue.1','default',0); insert into `secObjectName` (`objectName`) values ('_eform.doctor'); --- 1305,1308 ---- |
|
From: Marc D. <hex...@us...> - 2010-11-15 06:16:34
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7447/web/WEB-INF/classes/src/org/oscarehr/eyeform/web Modified Files: NoteAddonAction.java Log Message: removed system.outs Index: NoteAddonAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/NoteAddonAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** NoteAddonAction.java 15 Nov 2010 05:19:28 -0000 1.5 --- NoteAddonAction.java 15 Nov 2010 06:16:26 -0000 1.6 *************** *** 84,94 **** EyeForm eyeform = dao.getByAppointmentNo(Integer.parseInt(appointmentNo)); - - System.out.println("ack1_checked="+ack1Checked); - System.out.println("ack2_checked="+ack2Checked); - System.out.println("ack3_checked="+ack3Checked); - - System.out.println("appointmentNo="+appointmentNo); return null; --- 84,88 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-15 05:43:43
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv25464/docs Modified Files: git_eclipse_working_model.txt Log Message: updated documentation to be more clear Index: git_eclipse_working_model.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_eclipse_working_model.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** git_eclipse_working_model.txt 5 Nov 2010 03:51:20 -0000 1.4 --- git_eclipse_working_model.txt 15 Nov 2010 05:43:35 -0000 1.5 *************** *** 43,47 **** --------------- ! Getting updated --------------- To get updates from the remote repository. First right click on the project and do a team -> fetch from. --- 43,47 ---- --------------- ! Getting updates --------------- To get updates from the remote repository. First right click on the project and do a team -> fetch from. *************** *** 56,60 **** -------------- ! making updates -------------- Now say you've created new files in the project and altered some existing ones. --- 56,60 ---- -------------- ! Making changes -------------- Now say you've created new files in the project and altered some existing ones. *************** *** 70,72 **** If you go to the gerrit web page you should see the change is pending review now. ! --- 70,72 ---- If you go to the gerrit web page you should see the change is pending review now. ! Note that at this point, you and the central repository are not in sync, the files at the central repository must be approved first. Even after the changes on the central repository are approved, you must follow the "getting updates" again before you and the central repository are in sync (yes even if the files happen to be the same on the 2 servers, the pointers are not in sync until you merge). |
|
From: Marc D. <hex...@us...> - 2010-11-15 05:21:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv15584/web/WEB-INF/classes/src/org/oscarehr/eyeform/model Added Files: EyeForm.java Log Message: eyeform --- NEW FILE: EyeForm.java --- package org.oscarehr.eyeform.model; import java.util.Date; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import org.oscarehr.common.model.AbstractModel; @Entity @Table(name="eyeform") public class EyeForm extends AbstractModel<Integer>{ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer id; private int appointmentNo; private String discharge; private String stat; private String opt; @Temporal(TemporalType.TIMESTAMP) private Date date; public Integer getId() { return id; } public void setId(Integer id) { this.id = id; } public int getAppointmentNo() { return appointmentNo; } public void setAppointmentNo(int appointmentNo) { this.appointmentNo = appointmentNo; } public String getDischarge() { return discharge; } public void setDischarge(String discharge) { this.discharge = discharge; } public String getStat() { return stat; } public void setStat(String stat) { this.stat = stat; } public String getOpt() { return opt; } public void setOpt(String opt) { this.opt = opt; } public Date getDate() { return date; } public void setDate(Date date) { this.date = date; } } |
|
From: Marc D. <hex...@us...> - 2010-11-15 05:21:05
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv15584/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao Added Files: EyeFormDao.java Log Message: eyeform --- NEW FILE: EyeFormDao.java --- package org.oscarehr.eyeform.dao; import javax.persistence.Query; import org.oscarehr.common.dao.AbstractDao; import org.oscarehr.eyeform.model.EyeForm; import org.springframework.stereotype.Repository; @Repository public class EyeFormDao extends AbstractDao<EyeForm> { public EyeFormDao() { super(EyeForm.class); } public void save(EyeForm obj) { if(obj.getId()!=null && obj.getId().intValue()>0) { entityManager.merge(obj); } else { entityManager.persist(obj); } } public EyeForm getByAppointmentNo(int appointmentNo) { Query query = entityManager.createQuery("select x from "+modelClass.getSimpleName()+" x where x.appointmentNo=?1"); query.setParameter(1, appointmentNo); return (EyeForm)query.getSingleResult(); } } |
|
From: Marc D. <hex...@us...> - 2010-11-15 05:19:57
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14755/mysql/updates Added Files: update-2010-11-10-2.sql Log Message: eyeform --- NEW FILE: update-2010-11-10-2.sql --- -- -- Table structure for table `eyeform` -- DROP TABLE IF EXISTS `eyeform`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `eyeform` ( `id` int(11) NOT NULL AUTO_INCREMENT, `appointment_no` int(11) , `discharge` varchar(20), `stat` varchar(20), `opt` varchar(20), `date` timestamp , PRIMARY KEY (`id`) ) ENGINE=MyISAM AUTO_INCREMENT=6 ; /*!40101 SET character_set_client = @saved_cs_client */; |
|
From: Marc D. <hex...@us...> - 2010-11-15 05:19:37
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14308/web/js/custom Modified Files: eyeform-cme.js Log Message: eyeform Index: eyeform-cme.js =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom/eyeform-cme.js,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** eyeform-cme.js 4 Nov 2010 06:25:17 -0000 1.2 --- eyeform-cme.js 15 Nov 2010 05:19:29 -0000 1.3 *************** *** 3,21 **** issueNoteUrls = { ! divR1I1: ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=SocHistory&title=" + socHistoryLabel + "&cmd=divR1I1" , divR1I2: ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=MedHistory&title=" + medHistoryLabel + "&cmd=divR1I2" , ! divR2I1: ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=Concerns&title=" + onGoingLabel + "&cmd=divR2I1" , ! divR2I2: ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=Reminders&title=" + remindersLabel + "&cmd=divR2I2" , ! divR3I1: ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=DiagnosticNotes&title=" + diagnosticNotesLabel + "&cmd=divR3I1" + "&appointment_no="+appointmentNo, ! divR3I2: ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=PastOcularHistory&title=" + pastOcularHistoryLabel + "&cmd=divR3I2" + "&appointment_no="+appointmentNo, ! divR4I1: ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=OcularMedications&title=" + ocularMedicationsLabel + "&cmd=divR4I1" + "&appointment_no="+appointmentNo, ! divR4I2: ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=PatientLog&title=" + ocularMedicationsLabel + "&cmd=divR4I2" + "&appointment_no="+appointmentNo }; //add diagnostic notes, past ocular history, patient log, ocular medications //add a row ! addCppRow(3); ! addCppRow(4); ! //link save button --- 3,15 ---- issueNoteUrls = { ! divR1I1: ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=CurrentHistory&title=" + currentHistoryLabel + "&cmd=divR1I1" , divR1I2: ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=MedHistory&title=" + medHistoryLabel + "&cmd=divR1I2" , ! divR2I1: ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=DiagnosticNotes&title=" + diagnosticNotesLabel + "&cmd=divR2I1" + "&appointment_no="+appointmentNo, ! divR2I2: ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=PastOcularHistory&title=" + pastOcularHistoryLabel + "&cmd=divR2I2" + "&appointment_no="+appointmentNo, }; //add diagnostic notes, past ocular history, patient log, ocular medications //add a row ! //link save button |
|
From: Marc D. <hex...@us...> - 2010-11-15 05:19:37
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14308/web/eyeform Modified Files: current_note.jsp followup.jsp Log Message: eyeform Index: current_note.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/current_note.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** current_note.jsp 4 Nov 2010 06:25:16 -0000 1.2 --- current_note.jsp 15 Nov 2010 05:19:28 -0000 1.3 *************** *** 4,42 **** ! <c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/> <script> ! function setDischarge(){ ! if (document.inputForm.ack1.checked==true){ ! document.inputForm.dischargeFlag.value='true'; ! document.inputForm.ack1.value='checked'; ! } ! else { ! document.inputForm.dischargeFlag.value='false'; ! document.inputForm.ack1.value=''; ! } } function setStat(){ ! if (document.inputForm.ack2.checked==true){ ! document.inputForm.statFlag.value='true'; ! document.inputForm.ack2.value='checked'; ! } ! else { ! document.inputForm.statFlag.value='false'; ! document.inputForm.ack2.value=''; ! } } ! function setOpt(){ ! if (document.inputForm.ack3.checked==true){ ! document.inputForm.optFlag.value='true'; ! document.inputForm.ack3.value='checked'; ! } ! else { ! document.inputForm.optFlag.value='false'; ! document.inputForm.ack3.value=''; ! } ! ! } --- 4,27 ---- ! <c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/> ! ! <% ! Integer noteId = (Integer)request.getAttribute("noteId"); ! String aptNo = request.getParameter("appointmentNo"); ! String demographicNo = request.getParameter("demographicNo"); ! %> ! <script> ! ! function setDischarge(){ ! saveFlags(); } function setStat(){ ! saveFlags(); } ! function setOpt(){ ! saveFlags(); } *************** *** 82,85 **** --- 67,87 ---- } + + function saveFlags() { + + var ack1El = document.getElementById("ack1"); + var ack2El = document.getElementById("ack2"); + var ack3El = document.getElementById("ack3"); + + jQuery.ajax({ + type: 'GET', + url: ctx+'/eyeform/NoteData.do?method=saveFlags&ack1_checked=' + ack1El.checked + '&ack2_checked=' + ack2El.checked + '&ack3_checked=' + ack3El.checked + '&appointmentNo=' + <%=aptNo%> , + success: function (){}, + dataType: 'html' + }); + + + } + </script> *************** *** 99,107 **** <span> </span> ! <% ! Integer noteId = (Integer)request.getAttribute("noteId"); ! String aptNo = request.getParameter("appointmentNo"); ! String demographicNo = request.getParameter("demographicNo"); ! %> <a href="javascript:void(0)" onclick="popupPageOne('<c:out value="${ctx}"/>/eyeform/FollowUp.do?method=form&followup.demographicNo=<%=demographicNo %>&noteId=<%=noteId%>&followup.appointmentNo=<%=aptNo%>','eyeFollowUp');">[arrange follow up/consult]</a> --- 101,105 ---- <span> </span> ! <a href="javascript:void(0)" onclick="popupPageOne('<c:out value="${ctx}"/>/eyeform/FollowUp.do?method=form&followup.demographicNo=<%=demographicNo %>&noteId=<%=noteId%>&followup.appointmentNo=<%=aptNo%>','eyeFollowUp');">[arrange follow up/consult]</a> *************** *** 232,235 **** --- 230,249 ---- <tr><td> </td></tr> + <tr> + <td> + <input type="checkbox" style="width: 10%;" value="checked" id="ack1" onchange="setDischarge()" /> + Discharge + <br> + <input type="checkbox" style="width: 10%;" id="ack2" value="checked" onchange="setStat();" /> + STAT/PRN + <br> + <input type="checkbox" style="width: 10%;" value="checked" id="ack3" onchange="setOpt();" /> + optom routine + </td> + </tr> + + + <tr><td> </td></tr> + <tr> <td colspan="3"> Index: followup.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/followup.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** followup.jsp 9 Nov 2010 19:42:06 -0000 1.2 --- followup.jsp 15 Nov 2010 05:19:28 -0000 1.3 *************** *** 32,37 **** <table border="0"> <tbody><tr> ! <td width="25%">Follow up: ! <html:text property="followup.timespan" size="4" styleId="width: 25px;" styleClass="special"/> <html:select property="followup.timeframe" styleId="width: 50px;" styleClass="special"> --- 32,41 ---- <table border="0"> <tbody><tr> ! <td width="25%"> ! <html:select property="followup.type"> ! <html:option value="followup">Follow up</html:option> ! <html:option value="consult">Consult</html:option> ! </html:select> ! <html:text property="followup.timespan" size="4" styleId="width: 25px;" styleClass="special"/> <html:select property="followup.timeframe" styleId="width: 50px;" styleClass="special"> |
|
From: Marc D. <hex...@us...> - 2010-11-15 05:19:36
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14308/web/WEB-INF/classes/src/org/oscarehr/eyeform/model Modified Files: FollowUp.java Log Message: eyeform Index: FollowUp.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model/FollowUp.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FollowUp.java 9 Nov 2010 19:42:06 -0000 1.2 --- FollowUp.java 15 Nov 2010 05:19:28 -0000 1.3 *************** *** 47,51 **** --- 47,60 ---- private Provider provider; + private String type; + + + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } public Provider getProvider() { return provider; |
|
From: Marc D. <hex...@us...> - 2010-11-15 05:19:36
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14308/web/WEB-INF/classes/src/org/oscarehr/eyeform/web Modified Files: NoteAddonAction.java Log Message: eyeform Index: NoteAddonAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/NoteAddonAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** NoteAddonAction.java 9 Nov 2010 19:42:06 -0000 1.4 --- NoteAddonAction.java 15 Nov 2010 05:19:28 -0000 1.5 *************** *** 12,18 **** --- 12,20 ---- import org.oscarehr.PMmodule.dao.ProviderDao; import org.oscarehr.common.dao.DemographicDao; + import org.oscarehr.eyeform.dao.EyeFormDao; import org.oscarehr.eyeform.dao.FollowUpDao; import org.oscarehr.eyeform.dao.ProcedureBookDao; import org.oscarehr.eyeform.dao.TestBookRecordDao; + import org.oscarehr.eyeform.model.EyeForm; import org.oscarehr.eyeform.model.FollowUp; import org.oscarehr.eyeform.model.ProcedureBook; *************** *** 70,72 **** --- 72,96 ---- return null; } + + public ActionForward saveFlags(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { + String appointmentNo = request.getParameter("appointmentNo"); + + String ack1Checked = request.getParameter("ack1_checked"); + String ack2Checked = request.getParameter("ack2_checked"); + String ack3Checked = request.getParameter("ack3_checked"); + + + EyeFormDao dao = (EyeFormDao)SpringUtils.getBean("EyeFormDao"); + + EyeForm eyeform = dao.getByAppointmentNo(Integer.parseInt(appointmentNo)); + + + System.out.println("ack1_checked="+ack1Checked); + System.out.println("ack2_checked="+ack2Checked); + System.out.println("ack3_checked="+ack3Checked); + + System.out.println("appointmentNo="+appointmentNo); + + return null; + } } |
|
From: Marc D. <hex...@us...> - 2010-11-15 05:19:36
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14308/web/WEB-INF/classes Modified Files: oscarResources_en.properties Log Message: eyeform Index: oscarResources_en.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v retrieving revision 1.354 retrieving revision 1.355 diff -C2 -d -r1.354 -r1.355 *** oscarResources_en.properties 12 Nov 2010 20:56:28 -0000 1.354 --- oscarResources_en.properties 15 Nov 2010 05:19:28 -0000 1.355 *************** *** 5560,5563 **** --- 5560,5564 ---- oscarEncounter.eyeform.patientLog.title=Patient Log oscarEncounter.eyeform.ocularMedications.title=Ocular Medications + oscarEncounter.eyeform.currentHistory.title=Current History global.viewOcularProcedure=Ocular Procedures global.viewSpecsHistory=Specs History |
|
From: Marc D. <hex...@us...> - 2010-11-15 05:19:36
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14308/web/casemgmt Modified Files: newEncounterLayout.jsp Log Message: eyeform Index: newEncounterLayout.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/newEncounterLayout.jsp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** newEncounterLayout.jsp 15 Nov 2010 03:26:14 -0000 1.52 --- newEncounterLayout.jsp 15 Nov 2010 05:19:28 -0000 1.53 *************** *** 450,454 **** patientLogLabel = "oscarEncounter.eyeform.patientLog.title"; ocularMedicationsLabel = "oscarEncounter.eyeform.ocularMedications.title"; ! insertTemplateError = "<bean:message key="oscarEncounter.templateError.msg"/>"; unsavedNoteWarning = "<bean:message key="oscarEncounter.unsavedNoteWarning.msg"/>"; --- 450,455 ---- patientLogLabel = "oscarEncounter.eyeform.patientLog.title"; ocularMedicationsLabel = "oscarEncounter.eyeform.ocularMedications.title"; ! currentHistoryLabel = "oscarEncounter.eyeform.currentHistory.title"; ! insertTemplateError = "<bean:message key="oscarEncounter.templateError.msg"/>"; unsavedNoteWarning = "<bean:message key="oscarEncounter.unsavedNoteWarning.msg"/>"; |
|
From: Marc D. <hex...@us...> - 2010-11-15 05:19:36
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14308/database/mysql/updates Added Files: update-2010-11-10.sql Log Message: eyeform --- NEW FILE: update-2010-11-10.sql --- alter table eyeform_followup add type varchar(25); |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21088/web/oscarEncounter/oscarMeasurements Modified Files: removeMeasurementMap.jsp EditMeasurementGroupStyle.jsp ProcessAddMeasurementGroupAction.jsp ProcessEditMeasurementGroupAction.jsp exportMeasurement.jsp DisplayMeasurementTypes.jsp close.jsp AddMeasuringInstruction.jsp newHistoryIndex.jsp SelectMeasurementGroup.jsp DisplayMeasurementStyleSheet.jsp remapMeasurementMap.jsp AddMeasurementData.jsp EditMeasurementGroup.jsp TemplateFlowSheetPrint.jsp ProcessMeasurementsSubmission.jsp viewMeasurementMap.jsp TemplateFlowSheet.jsp AddMeasurementType.jsp AddMeasurementStyleSheet.jsp DefineNewMeasurementGroup.jsp HistoryIndex.jsp Measurements.jsp AddMeasurementGroup.jsp addMeasurementMap.jsp addMeasurementMap2.jsp Customization.jsp newMeasurementMap.jsp DisplayHistory.jsp Log Message: removed a slew of superfluous tags Index: viewMeasurementMap.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/viewMeasurementMap.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** viewMeasurementMap.jsp 9 Jul 2010 16:58:42 -0000 1.3 --- viewMeasurementMap.jsp 15 Nov 2010 03:26:17 -0000 1.4 *************** *** 24,29 **** */ --> - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- Index: EditMeasurementGroupStyle.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/EditMeasurementGroupStyle.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EditMeasurementGroupStyle.jsp 15 May 2010 22:10:48 -0000 1.6 --- EditMeasurementGroupStyle.jsp 15 Nov 2010 03:26:17 -0000 1.7 *************** *** 27,31 **** if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); %> - <%@ page language="java"%> <%@ page import="java.util.*,oscar.oscarReport.pageUtil.*"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> --- 27,30 ---- Index: EditMeasurementGroup.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/EditMeasurementGroup.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** EditMeasurementGroup.jsp 15 May 2010 22:10:48 -0000 1.9 --- EditMeasurementGroup.jsp 15 Nov 2010 03:26:17 -0000 1.10 *************** *** 27,31 **** if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); %> - <%@ page language="java"%> <%@ page import="java.util.*,oscar.oscarReport.pageUtil.*"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> --- 27,30 ---- Index: DisplayMeasurementTypes.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/DisplayMeasurementTypes.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DisplayMeasurementTypes.jsp 15 May 2010 22:10:48 -0000 1.8 --- DisplayMeasurementTypes.jsp 15 Nov 2010 03:26:17 -0000 1.9 *************** *** 27,31 **** if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); %> - <%@ page language="java"%> <%@ page import="java.util.*,oscar.oscarReport.pageUtil.*"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> --- 27,30 ---- Index: addMeasurementMap2.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/addMeasurementMap2.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** addMeasurementMap2.jsp 15 May 2010 22:10:48 -0000 1.2 --- addMeasurementMap2.jsp 15 Nov 2010 03:26:17 -0000 1.3 *************** *** 24,29 **** */ --> - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- Index: AddMeasuringInstruction.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/AddMeasuringInstruction.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** AddMeasuringInstruction.jsp 15 May 2010 22:10:48 -0000 1.8 --- AddMeasuringInstruction.jsp 15 Nov 2010 03:26:17 -0000 1.9 *************** *** 27,31 **** if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); %> - <%@ page language="java"%> <%@ page import="java.util.*,oscar.oscarReport.pageUtil.*"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> --- 27,30 ---- Index: HistoryIndex.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/HistoryIndex.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** HistoryIndex.jsp 15 May 2010 22:10:48 -0000 1.9 --- HistoryIndex.jsp 15 Nov 2010 03:26:17 -0000 1.10 *************** *** 28,32 **** 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"%> --- 28,31 ---- Index: ProcessEditMeasurementGroupAction.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/ProcessEditMeasurementGroupAction.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ProcessEditMeasurementGroupAction.jsp 15 May 2010 22:10:48 -0000 1.5 --- ProcessEditMeasurementGroupAction.jsp 15 Nov 2010 03:26:17 -0000 1.6 *************** *** 27,31 **** 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"%> --- 27,30 ---- Index: removeMeasurementMap.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/removeMeasurementMap.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** removeMeasurementMap.jsp 15 May 2010 22:10:48 -0000 1.5 --- removeMeasurementMap.jsp 15 Nov 2010 03:26:17 -0000 1.6 *************** *** 24,29 **** */ --> - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- Index: ProcessMeasurementsSubmission.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/ProcessMeasurementsSubmission.jsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ProcessMeasurementsSubmission.jsp 15 May 2010 22:10:48 -0000 1.10 --- ProcessMeasurementsSubmission.jsp 15 Nov 2010 03:26:17 -0000 1.11 *************** *** 27,31 **** 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"%> --- 27,30 ---- Index: Measurements.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/Measurements.jsp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Measurements.jsp 15 May 2010 22:10:48 -0000 1.20 --- Measurements.jsp 15 Nov 2010 03:26:17 -0000 1.21 *************** *** 27,31 **** 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"%> --- 27,30 ---- Index: exportMeasurement.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/exportMeasurement.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** exportMeasurement.jsp 15 May 2010 22:10:48 -0000 1.4 --- exportMeasurement.jsp 15 Nov 2010 03:26:17 -0000 1.5 *************** *** 29,33 **** --> <%@page contentType="text/xml"%> - <%@page pageEncoding="ISO-8859-1"%> <%@page import="oscar.oscarEncounter.oscarMeasurements.bean.*,oscar.oscarEncounter.oscarMeasurements.data.*"%> --- 29,32 ---- Index: DisplayMeasurementStyleSheet.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/DisplayMeasurementStyleSheet.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DisplayMeasurementStyleSheet.jsp 15 May 2010 22:10:48 -0000 1.5 --- DisplayMeasurementStyleSheet.jsp 15 Nov 2010 03:26:17 -0000 1.6 *************** *** 27,31 **** if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); %> - <%@ page language="java"%> <%@ page import="java.util.*,oscar.oscarReport.pageUtil.*"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> --- 27,30 ---- Index: DefineNewMeasurementGroup.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/DefineNewMeasurementGroup.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DefineNewMeasurementGroup.jsp 15 May 2010 22:10:48 -0000 1.9 --- DefineNewMeasurementGroup.jsp 15 Nov 2010 03:26:17 -0000 1.10 *************** *** 27,31 **** if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); %> - <%@ page language="java"%> <%@ page import="java.util.*,oscar.oscarReport.pageUtil.*"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> --- 27,30 ---- Index: AddMeasurementData.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/AddMeasurementData.jsp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** AddMeasurementData.jsp 9 Jul 2010 16:58:42 -0000 1.13 --- AddMeasurementData.jsp 15 Nov 2010 03:26:17 -0000 1.14 *************** *** 24,28 **** */ --> ! <%@page import="oscar.oscarDemographic.data.*,java.util.*,oscar.oscarPrevention.*,oscar.oscarProvider.data.*,oscar.util.*,oscar.oscarEncounter.oscarMeasurements.*,oscar.oscarEncounter.oscarMeasurements.bean.*,oscar.oscarEncounter.oscarMeasurements.pageUtil.*"%> <%@page import="org.springframework.web.context.support.WebApplicationContextUtils"%> <%@page import="org.springframework.web.context.WebApplicationContext"%> --- 24,28 ---- */ --> ! <%@page import="oscar.oscarDemographic.data.*,java.util.*,oscar.oscarPrevention.*,oscar.oscarProvider.data.*,oscar.util.*,oscar.oscarEncounter.oscarMeasurements.*,oscar.oscarEncounter.oscarMeasurements.bean.*,oscar.oscarEncounter.oscarMeasurements.pageUtil.*"%> <%@page import="org.springframework.web.context.support.WebApplicationContextUtils"%> <%@page import="org.springframework.web.context.WebApplicationContext"%> Index: TemplateFlowSheetPrint.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/TemplateFlowSheetPrint.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TemplateFlowSheetPrint.jsp 9 Jul 2010 16:58:42 -0000 1.6 --- TemplateFlowSheetPrint.jsp 15 Nov 2010 03:26:17 -0000 1.7 *************** *** 1,6 **** ! <% long startTime = System.currentTimeMillis(); %> ! <%@page contentType="text/html"%> ! <%@page pageEncoding="ISO-8859-1"%> ! <%@page import="oscar.oscarDemographic.data.*,java.util.*,oscar.oscarPrevention.*,oscar.oscarEncounter.oscarMeasurements.*,oscar.oscarEncounter.oscarMeasurements.bean.*,java.net.*"%> <%@page import="org.springframework.web.context.support.WebApplicationContextUtils"%> <%@page import="org.springframework.web.context.WebApplicationContext"%> --- 1,3 ---- ! <% long startTime = System.currentTimeMillis(); %><%@page import="oscar.oscarDemographic.data.*,java.util.*,oscar.oscarPrevention.*,oscar.oscarEncounter.oscarMeasurements.*,oscar.oscarEncounter.oscarMeasurements.bean.*,java.net.*"%> <%@page import="org.springframework.web.context.support.WebApplicationContextUtils"%> <%@page import="org.springframework.web.context.WebApplicationContext"%> Index: newHistoryIndex.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/newHistoryIndex.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** newHistoryIndex.jsp 15 May 2010 22:10:48 -0000 1.2 --- newHistoryIndex.jsp 15 Nov 2010 03:26:17 -0000 1.3 *************** *** 28,32 **** 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" %> --- 28,31 ---- Index: AddMeasurementStyleSheet.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/AddMeasurementStyleSheet.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AddMeasurementStyleSheet.jsp 15 May 2010 22:10:48 -0000 1.6 --- AddMeasurementStyleSheet.jsp 15 Nov 2010 03:26:17 -0000 1.7 *************** *** 27,31 **** if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); %> - <%@ page language="java"%> <%@ page import="java.util.*,oscar.oscarReport.pageUtil.*"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> --- 27,30 ---- Index: close.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/close.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** close.jsp 11 May 2010 00:14:27 -0000 1.5 --- close.jsp 15 Nov 2010 03:26:17 -0000 1.6 *************** *** 1,6 **** - <%@page contentType="text/html"%> - <%@page pageEncoding="ISO-8859-1"%> - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> --- 1,2 ---- Index: AddMeasurementGroup.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/AddMeasurementGroup.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** AddMeasurementGroup.jsp 15 May 2010 22:10:48 -0000 1.9 --- AddMeasurementGroup.jsp 15 Nov 2010 03:26:17 -0000 1.10 *************** *** 27,31 **** if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); %> - <%@ page language="java"%> <%@ page import="java.util.*,oscar.oscarReport.pageUtil.*"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> --- 27,30 ---- Index: TemplateFlowSheet.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/TemplateFlowSheet.jsp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** TemplateFlowSheet.jsp 18 Oct 2010 18:38:18 -0000 1.31 --- TemplateFlowSheet.jsp 15 Nov 2010 03:26:17 -0000 1.32 *************** *** 1,6 **** ! <% long startTime = System.currentTimeMillis(); %> ! <%@page contentType="text/html"%> ! <%@page pageEncoding="ISO-8859-1"%> ! <%@page import="oscar.oscarDemographic.data.*,java.util.*,oscar.oscarPrevention.*,oscar.oscarEncounter.oscarMeasurements.*,oscar.oscarEncounter.oscarMeasurements.bean.*,java.net.*"%> <%@page import="oscar.OscarProperties, oscar.util.StringUtils, org.oscarehr.common.dao.DemographicDao, org.oscarehr.common.model.Demographic" %> <%@page import="org.springframework.web.context.support.WebApplicationContextUtils,oscar.log.*"%> --- 1,3 ---- ! <% long startTime = System.currentTimeMillis(); %><%@page import="oscar.oscarDemographic.data.*,java.util.*,oscar.oscarPrevention.*,oscar.oscarEncounter.oscarMeasurements.*,oscar.oscarEncounter.oscarMeasurements.bean.*,java.net.*"%> <%@page import="oscar.OscarProperties, oscar.util.StringUtils, org.oscarehr.common.dao.DemographicDao, org.oscarehr.common.model.Demographic" %> <%@page import="org.springframework.web.context.support.WebApplicationContextUtils,oscar.log.*"%> Index: AddMeasurementType.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/AddMeasurementType.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** AddMeasurementType.jsp 15 May 2010 22:10:48 -0000 1.9 --- AddMeasurementType.jsp 15 Nov 2010 03:26:17 -0000 1.10 *************** *** 27,31 **** if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); %> - <%@ page language="java"%> <%@ page import="java.util.*,oscar.oscarReport.pageUtil.*"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> --- 27,30 ---- Index: newMeasurementMap.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/newMeasurementMap.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** newMeasurementMap.jsp 15 May 2010 22:10:48 -0000 1.5 --- newMeasurementMap.jsp 15 Nov 2010 03:26:17 -0000 1.6 *************** *** 24,29 **** */ --> - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- Index: Customization.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/Customization.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Customization.jsp 15 May 2010 22:10:48 -0000 1.9 --- Customization.jsp 15 Nov 2010 03:26:17 -0000 1.10 *************** *** 27,31 **** 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"%> --- 27,30 ---- Index: addMeasurementMap.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/addMeasurementMap.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** addMeasurementMap.jsp 15 May 2010 22:10:48 -0000 1.6 --- addMeasurementMap.jsp 15 Nov 2010 03:26:17 -0000 1.7 *************** *** 24,29 **** */ --> - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- Index: SelectMeasurementGroup.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/SelectMeasurementGroup.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SelectMeasurementGroup.jsp 15 May 2010 22:10:48 -0000 1.8 --- SelectMeasurementGroup.jsp 15 Nov 2010 03:26:17 -0000 1.9 *************** *** 27,31 **** if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); %> - <%@ page language="java"%> <%@ page import="java.util.*,oscar.oscarReport.pageUtil.*"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> --- 27,30 ---- Index: remapMeasurementMap.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/remapMeasurementMap.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** remapMeasurementMap.jsp 15 May 2010 22:10:48 -0000 1.5 --- remapMeasurementMap.jsp 15 Nov 2010 03:26:17 -0000 1.6 *************** *** 24,29 **** */ --> - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- Index: DisplayHistory.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/DisplayHistory.jsp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** DisplayHistory.jsp 15 May 2010 22:10:48 -0000 1.20 --- DisplayHistory.jsp 15 Nov 2010 03:26:17 -0000 1.21 *************** *** 1,3 **** - <%@page contentType="text/html" pageEncoding="ISO-8859-1"%> <!-- /* --- 1,2 ---- *************** *** 28,32 **** 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"%> --- 27,30 ---- Index: ProcessAddMeasurementGroupAction.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/ProcessAddMeasurementGroupAction.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ProcessAddMeasurementGroupAction.jsp 15 May 2010 22:10:48 -0000 1.6 --- ProcessAddMeasurementGroupAction.jsp 15 Nov 2010 03:26:17 -0000 1.7 *************** *** 27,31 **** 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"%> --- 27,30 ---- |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/immunization/config In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21088/web/oscarEncounter/immunization/config Modified Files: ImmunizationSetDisplay.jsp CreateImmunizationSetConfig.jsp CreateImmunizationSetInit.jsp AdministrateImmunizationSets.jsp Log Message: removed a slew of superfluous tags Index: CreateImmunizationSetInit.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/immunization/config/CreateImmunizationSetInit.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CreateImmunizationSetInit.jsp 15 May 2010 22:10:51 -0000 1.6 --- CreateImmunizationSetInit.jsp 15 Nov 2010 03:26:16 -0000 1.7 *************** *** 24,29 **** */ --> - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- Index: ImmunizationSetDisplay.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/immunization/config/ImmunizationSetDisplay.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ImmunizationSetDisplay.jsp 7 Jul 2010 21:01:26 -0000 1.7 --- ImmunizationSetDisplay.jsp 15 Nov 2010 03:26:16 -0000 1.8 *************** *** 24,30 **** */ --> - - <%@ page language="java"%> - <%@ page import="java.util.*, org.w3c.dom.*, oscar.util.*"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> --- 24,27 ---- Index: AdministrateImmunizationSets.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/immunization/config/AdministrateImmunizationSets.jsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** AdministrateImmunizationSets.jsp 15 May 2010 22:10:51 -0000 1.10 --- AdministrateImmunizationSets.jsp 15 Nov 2010 03:26:16 -0000 1.11 *************** *** 24,29 **** */ --> - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- Index: CreateImmunizationSetConfig.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/immunization/config/CreateImmunizationSetConfig.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CreateImmunizationSetConfig.jsp 9 Jul 2010 16:58:43 -0000 1.6 --- CreateImmunizationSetConfig.jsp 15 Nov 2010 03:26:16 -0000 1.7 *************** *** 24,29 **** */ --> - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-15 03:26:56
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/inr In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21088/web/billing/CA/ON/inr Modified Files: dbUpdateINRbilling.jsp Log Message: removed a slew of superfluous tags Index: dbUpdateINRbilling.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/inr/dbUpdateINRbilling.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** dbUpdateINRbilling.jsp 27 Sep 2010 10:16:24 -0000 1.9 --- dbUpdateINRbilling.jsp 15 Nov 2010 03:26:18 -0000 1.10 *************** *** 35,39 **** %> ! <%@ page import="java.sql.*, java.util.*,java.net.*, oscar.MyDateFormat" errorPage="../../errorpage.jsp"%> <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" /> --- 35,39 ---- %> ! <%@page import="java.sql.*, java.util.*,java.net.*, oscar.MyDateFormat" errorPage="../../errorpage.jsp"%> <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" /> |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/phr In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21088/web/phr Modified Files: PHRRedirectToPhrForm.jsp PHRDocNotFound.jsp PHRLoginAndRedirect.jsp SendToPhrPreview.jsp AuthInclude.jsp response.jsp Log Message: removed a slew of superfluous tags Index: AuthInclude.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/phr/AuthInclude.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** AuthInclude.jsp 4 Jun 2010 15:00:12 -0000 1.9 --- AuthInclude.jsp 15 Nov 2010 03:26:18 -0000 1.10 *************** *** 3,11 **** 1. pathtophr - example: ../../phr/ (tail slash requrement) (as of July 22, 2009 - not needed) 2. forwardto - where to go after user is authenticated ! --%> ! ! <%@page contentType="text/html"%> ! <%@page pageEncoding="ISO-8859-1"%> ! <%-- The taglib directive below imports the JSTL library. If you uncomment it, you must also add the JSTL library to the project. The Add Library... action --- 3,7 ---- 1. pathtophr - example: ../../phr/ (tail slash requrement) (as of July 22, 2009 - not needed) 2. forwardto - where to go after user is authenticated ! --%><%-- The taglib directive below imports the JSTL library. If you uncomment it, you must also add the JSTL library to the project. The Add Library... action Index: SendToPhrPreview.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/phr/SendToPhrPreview.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SendToPhrPreview.jsp 11 May 2010 01:05:11 -0000 1.4 --- SendToPhrPreview.jsp 15 Nov 2010 03:26:18 -0000 1.5 *************** *** 4,9 **** Author : apavel --%> - - <%@page contentType="text/html" pageEncoding="ISO-8859-1"%> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> --- 4,7 ---- Index: response.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/phr/response.jsp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** response.jsp 11 May 2010 01:05:11 -0000 1.11 --- response.jsp 15 Nov 2010 03:26:18 -0000 1.12 *************** *** 1,4 **** - <%@page contentType="text/html"%> - <%@page pageEncoding="ISO-8859-1"%> <%-- The taglib directive below imports the JSTL library. If you uncomment it, --- 1,2 ---- Index: PHRDocNotFound.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/phr/PHRDocNotFound.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PHRDocNotFound.jsp 11 May 2010 01:05:11 -0000 1.6 --- PHRDocNotFound.jsp 15 Nov 2010 03:26:18 -0000 1.7 *************** *** 1,4 **** - <%@page contentType="text/html"%> - <%@page pageEncoding="ISO-8859-1"%> <%-- The taglib directive below imports the JSTL library. If you uncomment it, --- 1,2 ---- Index: PHRLoginAndRedirect.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/phr/PHRLoginAndRedirect.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PHRLoginAndRedirect.jsp 11 May 2010 01:05:11 -0000 1.3 --- PHRLoginAndRedirect.jsp 15 Nov 2010 03:26:18 -0000 1.4 *************** *** 1,4 **** - <%@page contentType="text/html"%> - <%@page pageEncoding="ISO-8859-1"%> <%-- The taglib directive below imports the JSTL library. If you uncomment it, --- 1,2 ---- Index: PHRRedirectToPhrForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/phr/PHRRedirectToPhrForm.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PHRRedirectToPhrForm.jsp 11 May 2010 01:05:11 -0000 1.3 --- PHRRedirectToPhrForm.jsp 15 Nov 2010 03:26:18 -0000 1.4 *************** *** 4,9 **** Author : apavel --%> - - <%@page contentType="text/html" pageEncoding="ISO-8859-1"%> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> --- 4,7 ---- |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21088/web/oscarEncounter Modified Files: RemoteAttachments.jsp LeftNavBarDisplay.jsp ViewAttachment.jsp encounterCPP.jsp clinicModules.jsp TimeOut.jsp encounterPrint.jsp newEncounter.jsp calculators.jsp About.jsp InsertTemplate2.jsp InsertTemplate.jsp Help.jsp formlist.jsp echarthistoryprint.jsp LeftNavBarError.jsp License.jsp Log Message: removed a slew of superfluous tags Index: formlist.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/formlist.jsp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** formlist.jsp 22 Sep 2010 11:56:05 -0000 1.13 --- formlist.jsp 15 Nov 2010 03:26:17 -0000 1.14 *************** *** 1,6 **** <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> - - <%@ page language="java"%> <%@ page import="oscar.util.UtilMisc,oscar.oscarEncounter.data.*,java.net.*,java.util.*"%> --- 1,4 ---- Index: Help.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/Help.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Help.jsp 15 May 2010 22:10:47 -0000 1.7 --- Help.jsp 15 Nov 2010 03:26:17 -0000 1.8 *************** *** 24,29 **** */ --%> - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- Index: echarthistoryprint.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/echarthistoryprint.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** echarthistoryprint.jsp 15 May 2010 22:10:47 -0000 1.6 --- echarthistoryprint.jsp 15 Nov 2010 03:26:17 -0000 1.7 *************** *** 24,29 **** */ --%> - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- Index: License.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/License.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** License.jsp 15 May 2010 22:10:47 -0000 1.6 --- License.jsp 15 Nov 2010 03:26:17 -0000 1.7 *************** *** 24,29 **** */ --%> - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- Index: encounterCPP.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/encounterCPP.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** encounterCPP.jsp 20 Sep 2010 11:08:56 -0000 1.8 --- encounterCPP.jsp 15 Nov 2010 03:26:17 -0000 1.9 *************** *** 24,29 **** */ --%> - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- Index: RemoteAttachments.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/RemoteAttachments.jsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** RemoteAttachments.jsp 28 Sep 2010 03:00:50 -0000 1.10 --- RemoteAttachments.jsp 15 Nov 2010 03:26:17 -0000 1.11 *************** *** 1,3 **** - <%@ page language="java"%> <%@ page import="oscar.oscarEncounter.immunization.data.*"%> <%@ page --- 1,2 ---- Index: About.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/About.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** About.jsp 15 May 2010 22:10:47 -0000 1.7 --- About.jsp 15 Nov 2010 03:26:17 -0000 1.8 *************** *** 24,29 **** */ --%> - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- Index: ViewAttachment.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/ViewAttachment.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ViewAttachment.jsp 9 Jul 2010 16:58:42 -0000 1.9 --- ViewAttachment.jsp 15 Nov 2010 03:26:17 -0000 1.10 *************** *** 1,3 **** - <%@ page language="java"%> <%@ page import="oscar.oscarEncounter.immunization.data.*,oscar.util.UtilXML"%> --- 1,2 ---- Index: encounterPrint.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/encounterPrint.jsp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** encounterPrint.jsp 15 May 2010 22:10:47 -0000 1.11 --- encounterPrint.jsp 15 Nov 2010 03:26:17 -0000 1.12 *************** *** 24,29 **** */ --%> - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- Index: newEncounter.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/newEncounter.jsp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** newEncounter.jsp 6 Oct 2010 21:52:14 -0000 1.13 --- newEncounter.jsp 15 Nov 2010 03:26:17 -0000 1.14 *************** *** 1,4 **** - <%@page contentType="text/html"%> - <%@page pageEncoding="ISO-8859-1"%> <%@page import="java.util.Collections, java.util.Arrays, java.util.ArrayList, java.sql.ResultSet, java.sql.SQLException, oscar.oscarDB.DBHandler"%> --- 1,2 ---- Index: LeftNavBarDisplay.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/LeftNavBarDisplay.jsp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** LeftNavBarDisplay.jsp 7 Jul 2010 21:01:29 -0000 1.27 --- LeftNavBarDisplay.jsp 15 Nov 2010 03:26:17 -0000 1.28 *************** *** 1,3 **** - <%@page contentType="text/html" pageEncoding="ISO-8859-1"%> <%@page import="oscar.oscarEncounter.pageUtil.NavBarDisplayDAO, oscar.util.*, java.util.ArrayList, java.util.Date, java.util.Calendar, java.io.IOException"%> --- 1,2 ---- Index: InsertTemplate.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/InsertTemplate.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** InsertTemplate.jsp 15 May 2010 22:10:47 -0000 1.6 --- InsertTemplate.jsp 15 Nov 2010 03:26:17 -0000 1.7 *************** *** 28,32 **** 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"%> --- 28,31 ---- Index: clinicModules.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/clinicModules.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** clinicModules.jsp 9 Jul 2010 16:58:42 -0000 1.5 --- clinicModules.jsp 15 Nov 2010 03:26:17 -0000 1.6 *************** *** 1,4 **** ! <%@page contentType="text/html"%> ! <%-- <%@page pageEncoding="ISO-8859-1"%> --%> <%@page import="java.net.URLEncoder"%> --- 1,3 ---- ! <%-- <%@page %> --%> <%@page import="java.net.URLEncoder"%> Index: InsertTemplate2.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/InsertTemplate2.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** InsertTemplate2.jsp 15 May 2010 22:10:47 -0000 1.4 --- InsertTemplate2.jsp 15 Nov 2010 03:26:17 -0000 1.5 *************** *** 28,32 **** 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" %> --- 28,31 ---- Index: LeftNavBarError.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/LeftNavBarError.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LeftNavBarError.jsp 11 May 2010 00:14:28 -0000 1.3 --- LeftNavBarError.jsp 15 Nov 2010 03:26:17 -0000 1.4 *************** *** 1,4 **** - <%@page contentType="text/html"%> - <%@page pageEncoding="ISO-8859-1"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> --- 1,2 ---- Index: TimeOut.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/TimeOut.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TimeOut.jsp 15 May 2010 22:10:47 -0000 1.6 --- TimeOut.jsp 15 Nov 2010 03:26:17 -0000 1.7 *************** *** 26,30 **** <!-- Jan 20, 2003,--> - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 26,29 ---- Index: calculators.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/calculators.jsp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** calculators.jsp 15 May 2010 22:10:47 -0000 1.11 --- calculators.jsp 15 Nov 2010 03:26:17 -0000 1.12 *************** *** 24,29 **** */ --%> - - <%@ page language="java"%> <%@ page import="oscar.oscarDemographic.data.*, oscar.oscarDemographic.data.DemographicData.Demographic"%> --- 24,27 ---- |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21088/web/billing/CA/BC Modified Files: wcbForms.jsp wcbMigrate.jsp billingCreated.jsp dxcode_svccode_assoc.jsp receivePayment.jsp billingSVCTrayAssoc.jsp billingReportControl.jsp billStatus.jsp billingPreferences.jsp billingBC.jsp billingView.jsp billingCalendarPopup.jsp billReceipt.jsp billingAccountReports.jsp billType_frag.jsp adjustBill.jsp Log Message: removed a slew of superfluous tags Index: wcbMigrate.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/wcbMigrate.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wcbMigrate.jsp 11 May 2010 01:05:13 -0000 1.3 --- wcbMigrate.jsp 15 Nov 2010 03:26:17 -0000 1.4 *************** *** 25,29 **** --%> <%@page import="org.oscarehr.util.DbConnectionFilter,java.sql.*" %> - <%@page contentType="text/html" pageEncoding="ISO-8859-1"%> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> --- 25,28 ---- Index: wcbForms.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/wcbForms.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wcbForms.jsp 19 Aug 2010 08:36:10 -0000 1.7 --- wcbForms.jsp 15 Nov 2010 03:26:17 -0000 1.8 *************** *** 31,35 **** <%@taglib uri="http://java.sun.com/jstl/core" prefix="c"%> <%@taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%> - <%@page contentType="text/html" pageEncoding="ISO-8859-1"%> <%String demographicNo = request.getParameter("demographicNo"); String wcbid = request.getParameter("wcbid"); --- 31,34 ---- Index: billType_frag.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billType_frag.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** billType_frag.jsp 2 Jul 2009 19:31:46 -0000 1.3 --- billType_frag.jsp 15 Nov 2010 03:26:17 -0000 1.4 *************** *** 25,29 **** */ --> ! <%@page contentType="text/html; charset=iso-8859-1" language="java" import="java.sql.*" errorPage=""%> <%@page --- 25,29 ---- */ --> ! <%@page contentType="text/html; charset=iso-8859-1" import="java.sql.*" errorPage=""%> <%@page Index: billingReportControl.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billingReportControl.jsp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** billingReportControl.jsp 27 Sep 2010 11:02:46 -0000 1.15 --- billingReportControl.jsp 15 Nov 2010 03:26:17 -0000 1.16 *************** *** 24,28 **** */ --> - <%@ page language="java" contentType="text/html"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- Index: receivePayment.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/receivePayment.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** receivePayment.jsp 18 Dec 2008 17:26:54 -0000 1.3 --- receivePayment.jsp 15 Nov 2010 03:26:17 -0000 1.4 *************** *** 1,3 **** ! <%@page contentType="text/html; charset=iso-8859-1" language="java" import="java.sql.*" errorPage=""%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> --- 1,3 ---- ! <%@page contentType="text/html; charset=iso-8859-1" import="java.sql.*" errorPage=""%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> Index: billingCalendarPopup.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billingCalendarPopup.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** billingCalendarPopup.jsp 15 May 2010 22:10:48 -0000 1.7 --- billingCalendarPopup.jsp 15 Nov 2010 03:26:17 -0000 1.8 *************** *** 26,30 **** Use returnForm and returnItem request params and this page will fill in that input item on that page --> - <%@ page language="java" contentType="text/html"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 26,29 ---- Index: billingSVCTrayAssoc.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billingSVCTrayAssoc.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** billingSVCTrayAssoc.jsp 18 Dec 2008 17:26:54 -0000 1.4 --- billingSVCTrayAssoc.jsp 15 Nov 2010 03:26:17 -0000 1.5 *************** *** 1,3 **** ! <%@page contentType="text/html; charset=iso-8859-1" language="java" import="java.sql.*" errorPage=""%> <%@taglib uri="http://displaytag.sf.net" prefix="display"%> --- 1,3 ---- ! <%@page contentType="text/html; charset=iso-8859-1" import="java.sql.*" errorPage=""%> <%@taglib uri="http://displaytag.sf.net" prefix="display"%> Index: billingView.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billingView.jsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** billingView.jsp 15 May 2010 22:10:48 -0000 1.10 --- billingView.jsp 15 Nov 2010 03:26:17 -0000 1.11 *************** *** 29,40 **** */ --> - - - - - - - - <%@ page language="java" contentType="text/html"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 29,32 ---- Index: dxcode_svccode_assoc.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/dxcode_svccode_assoc.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dxcode_svccode_assoc.jsp 18 Dec 2008 17:26:54 -0000 1.4 --- dxcode_svccode_assoc.jsp 15 Nov 2010 03:26:17 -0000 1.5 *************** *** 1,3 **** - <%@ page language="java" contentType="text/html"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 1,2 ---- Index: billingCreated.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billingCreated.jsp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** billingCreated.jsp 15 May 2010 22:10:48 -0000 1.21 --- billingCreated.jsp 15 Nov 2010 03:26:17 -0000 1.22 *************** *** 29,40 **** */ --> - - - - - - - - <%@ page language="java" contentType="text/html"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 29,32 ---- Index: billStatus.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billStatus.jsp,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** billStatus.jsp 27 Sep 2010 10:00:42 -0000 1.46 --- billStatus.jsp 15 Nov 2010 03:26:17 -0000 1.47 *************** *** 28,32 **** */ --> - <%@ page language="java" contentType="text/html" %> <%@ page import="java.math.*,java.util.*, java.sql.*, oscar.*, java.net.*,oscar.oscarBilling.ca.bc.MSP.*,oscar.util.*" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> --- 28,31 ---- Index: billingBC.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billingBC.jsp,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** billingBC.jsp 2 Jul 2010 18:04:19 -0000 1.69 --- billingBC.jsp 15 Nov 2010 03:26:17 -0000 1.70 *************** *** 29,33 **** */ --> - <%@page language="java" contentType="text/html"%> <%@taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 29,32 ---- Index: billReceipt.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billReceipt.jsp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** billReceipt.jsp 20 Aug 2010 00:53:32 -0000 1.24 --- billReceipt.jsp 15 Nov 2010 03:26:17 -0000 1.25 *************** *** 29,33 **** */ --> - <%@page language="java" contentType="text/html"%> <%@taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 29,32 ---- Index: adjustBill.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/adjustBill.jsp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** adjustBill.jsp 20 Sep 2010 10:59:32 -0000 1.55 --- adjustBill.jsp 15 Nov 2010 03:26:17 -0000 1.56 *************** *** 1,3 **** - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> --- 1,2 ---- Index: billingPreferences.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billingPreferences.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** billingPreferences.jsp 15 May 2010 22:10:48 -0000 1.7 --- billingPreferences.jsp 15 Nov 2010 03:26:17 -0000 1.8 *************** *** 25,29 **** */ --> - <%@page language="java"%> <%@taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 25,28 ---- Index: billingAccountReports.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billingAccountReports.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** billingAccountReports.jsp 27 Sep 2010 10:00:42 -0000 1.9 --- billingAccountReports.jsp 15 Nov 2010 03:26:17 -0000 1.10 *************** *** 29,33 **** */ --> - <%@page language="java" contentType="text/html"%> <%@page import="java.math.*,java.util.*, java.sql.*, oscar.*, java.net.*,oscar.oscarBilling.ca.bc.MSP.*,oscar.util.*"%> --- 29,32 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-15 03:26:56
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21088/web Modified Files: packageNA.jsp index.jsp logout.jsp loginfailed.jsp Log Message: removed a slew of superfluous tags Index: loginfailed.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/loginfailed.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** loginfailed.jsp 2 Jun 2010 16:13:09 -0000 1.6 --- loginfailed.jsp 15 Nov 2010 03:26:18 -0000 1.7 *************** *** 25,29 **** --%> ! <%@ page language="java" contentType="text/html" import="oscar.OscarProperties"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> --- 25,29 ---- --%> ! <%@page import="oscar.OscarProperties"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> Index: index.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/index.jsp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** index.jsp 20 Sep 2010 16:31:52 -0000 1.36 --- index.jsp 15 Nov 2010 03:26:18 -0000 1.37 *************** *** 25,29 **** --> ! <%@ page language="java" contentType="text/html" import="oscar.OscarProperties, oscar.util.BuildInfo, javax.servlet.http.Cookie, oscar.oscarSecurity.CookieSecurity, oscar.login.UAgentInfo" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> --- 25,29 ---- --> ! <%@page import="oscar.OscarProperties, oscar.util.BuildInfo, javax.servlet.http.Cookie, oscar.oscarSecurity.CookieSecurity, oscar.login.UAgentInfo" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> Index: logout.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/logout.jsp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** logout.jsp 7 Jul 2010 21:01:31 -0000 1.11 --- logout.jsp 15 Nov 2010 03:26:18 -0000 1.12 *************** *** 25,29 **** --%> ! <%@ page language="java" import="java.util.HashMap, oscar.log.*" errorPage="errorpage.jsp"%> <% --- 25,29 ---- --%> ! <%@page import="java.util.HashMap, oscar.log.*" errorPage="errorpage.jsp"%> <% Index: packageNA.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/packageNA.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** packageNA.jsp 15 May 2010 22:11:00 -0000 1.6 --- packageNA.jsp 15 Nov 2010 03:26:18 -0000 1.7 *************** *** 24,29 **** */ --> - - <%@ page language="java" contentType="text/html"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-15 03:26:56
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ON In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21088/web/lab/CA/ON Modified Files: CMLDisplay.jsp labValuesGraph.jsp labValues.jsp Log Message: removed a slew of superfluous tags Index: CMLDisplay.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ON/CMLDisplay.jsp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** CMLDisplay.jsp 6 Oct 2010 21:52:12 -0000 1.20 --- CMLDisplay.jsp 15 Nov 2010 03:26:18 -0000 1.21 *************** *** 1,3 **** ! <%@ page language="java" errorPage="../provider/errorpage.jsp"%> <%@ page import="java.util.*, oscar.oscarMDS.data.*,oscar.oscarLab.ca.on.CML.*,oscar.oscarLab.LabRequestReportLink,oscar.oscarDB.*,java.sql.*,oscar.log.*"%> --- 1,3 ---- ! <%@page errorPage="../provider/errorpage.jsp"%> <%@ page import="java.util.*, oscar.oscarMDS.data.*,oscar.oscarLab.ca.on.CML.*,oscar.oscarLab.LabRequestReportLink,oscar.oscarDB.*,java.sql.*,oscar.log.*"%> Index: labValuesGraph.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ON/labValuesGraph.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** labValuesGraph.jsp 9 Jul 2010 16:58:43 -0000 1.3 --- labValuesGraph.jsp 15 Nov 2010 03:26:18 -0000 1.4 *************** *** 1,3 **** - <%@ page language="java" %> <%@ page import="java.util.*,oscar.oscarLab.ca.on.*,oscar.oscarDemographic.data.*"%> --- 1,2 ---- Index: labValues.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ON/labValues.jsp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** labValues.jsp 5 Oct 2010 20:14:27 -0000 1.11 --- labValues.jsp 15 Nov 2010 03:26:18 -0000 1.12 *************** *** 1,3 **** ! <%@ page language="java" errorPage="../provider/errorpage.jsp"%> <%@ page import="java.util.*,oscar.oscarLab.ca.on.*,oscar.oscarDemographic.data.*"%> --- 1,3 ---- ! <%@page errorPage="../provider/errorpage.jsp"%> <%@ page import="java.util.*,oscar.oscarLab.ca.on.*,oscar.oscarDemographic.data.*"%> |
