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: Randy J. <rj...@us...> - 2010-11-12 20:59:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv930 Modified Files: EctConAddSpecialistAction.java Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected Index: EctConAddSpecialistAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConAddSpecialistAction.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** EctConAddSpecialistAction.java 25 Jun 2010 18:21:19 -0000 1.14 --- EctConAddSpecialistAction.java 12 Nov 2010 20:59:12 -0000 1.15 *************** *** 106,109 **** --- 106,110 ---- professionalSpecialist.seteDataServiceKey(addSpecailistForm.geteDataServiceKey()); professionalSpecialist.seteDataServiceName(addSpecailistForm.geteDataServiceName()); + professionalSpecialist.setAnnotation(addSpecailistForm.getAnnotation()); } } |
|
From: Randy J. <rj...@us...> - 2010-11-12 20:59:01
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv818 Modified Files: ProfessionalSpecialist.java Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected Index: ProfessionalSpecialist.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/ProfessionalSpecialist.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ProfessionalSpecialist.java 25 Jun 2010 18:21:20 -0000 1.6 --- ProfessionalSpecialist.java 12 Nov 2010 20:58:53 -0000 1.7 *************** *** 80,83 **** --- 80,84 ---- private String eDataServiceKey; private String eDataServiceName; + private String annotation; @Temporal(TemporalType.TIMESTAMP) *************** *** 206,209 **** --- 207,224 ---- this.eDataServiceName = StringUtils.trimToNull(eDataServiceName); } + + /** + * @return the annotation + */ + public String getAnnotation() { + return annotation; + } + + /** + * @param annotation the annotation to set + */ + public void setAnnotation(String annotation) { + this.annotation = StringUtils.trimToNull(annotation); + } |
|
From: Randy J. <rj...@us...> - 2010-11-12 20:58:45
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv756 Modified Files: EctConEditSpecialistsAction.java Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected Index: EctConEditSpecialistsAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConEditSpecialistsAction.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** EctConEditSpecialistsAction.java 9 Jul 2010 21:37:17 -0000 1.14 --- EctConEditSpecialistsAction.java 12 Nov 2010 20:58:38 -0000 1.15 *************** *** 40,44 **** public class EctConEditSpecialistsAction extends Action { ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ProfessionalSpecialistDao professionalSpecialistDao=(ProfessionalSpecialistDao)SpringUtils.getBean("professionalSpecialistDao"); --- 40,44 ---- public class EctConEditSpecialistsAction extends Action { ! @Override public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ProfessionalSpecialistDao professionalSpecialistDao=(ProfessionalSpecialistDao)SpringUtils.getBean("professionalSpecialistDao"); *************** *** 83,86 **** --- 83,87 ---- request.setAttribute("eDataServiceKey", professionalSpecialist.geteDataServiceKey()); request.setAttribute("eDataServiceName", professionalSpecialist.geteDataServiceName()); + request.setAttribute("annotation", professionalSpecialist.getAnnotation()); request.setAttribute("upd", new Integer(updater)); EctConConstructSpecialistsScriptsFile constructSpecialistsScriptsFile = new EctConConstructSpecialistsScriptsFile(); |
|
From: Randy J. <rj...@us...> - 2010-11-12 20:57:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv516 Modified Files: EctConAddSpecialistForm.java Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected Index: EctConAddSpecialistForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConAddSpecialistForm.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** EctConAddSpecialistForm.java 25 Jun 2010 18:21:19 -0000 1.13 --- EctConAddSpecialistForm.java 12 Nov 2010 20:57:34 -0000 1.14 *************** *** 49,52 **** --- 49,53 ---- String eDataServiceKey; String eDataServiceName; + String annotation; public EctConAddSpecialistForm() { *************** *** 188,191 **** --- 189,193 ---- eDataOscarKey = null; eDataServiceKey = null; + annotation = null; whichType = 0; } *************** *** 241,244 **** --- 243,252 ---- } + public String getAnnotation() { + return annotation; + } + public void setAnnotation(String annotation) { + this.annotation = annotation; + } } |
|
From: Randy J. <rj...@us...> - 2010-11-12 20:57:12
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/config In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv378 Modified Files: AddSpecialist.jsp Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected Index: AddSpecialist.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/config/AddSpecialist.jsp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** AddSpecialist.jsp 25 Jun 2010 18:21:20 -0000 1.14 --- AddSpecialist.jsp 12 Nov 2010 20:57:04 -0000 1.15 *************** *** 118,121 **** --- 118,122 ---- thisForm.seteDataServiceKey( (String) request.getAttribute("eDataServiceKey")); thisForm.seteDataServiceName( (String) request.getAttribute("eDataServiceName")); + thisForm.setAnnotation((String)request.getAttribute("annotation")); } %> *************** *** 133,137 **** <td><bean:message key="oscarEncounter.oscarConsultationRequest.config.AddSpecialist.address" /> </td> ! <td colspan="5"><html:textarea name="EctConAddSpecialistForm" property="address" cols="30" rows="3" /> <%=oscarVariables.getProperty("consultation_comments","") %> </td> </tr> --- 134,142 ---- <td><bean:message key="oscarEncounter.oscarConsultationRequest.config.AddSpecialist.address" /> </td> ! <td><html:textarea name="EctConAddSpecialistForm" property="address" cols="30" rows="3" /> <%=oscarVariables.getProperty("consultation_comments","") %> ! </td> ! <td><bean:message key="oscarEncounter.oscarConsultationRequest.config.EditSpecialists.Annotation" /> ! </td> ! <td colspan="4"><html:textarea name="EctConAddSpecialistForm" property="annotation" cols="30" rows="3" /> </td> </tr> |
|
From: Randy J. <rj...@us...> - 2010-11-12 20:56:36
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32703 Modified Files: oscarResources_en.properties Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected Index: oscarResources_en.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v retrieving revision 1.353 retrieving revision 1.354 diff -C2 -d -r1.353 -r1.354 *** oscarResources_en.properties 8 Nov 2010 22:28:37 -0000 1.353 --- oscarResources_en.properties 12 Nov 2010 20:56:28 -0000 1.354 *************** *** 1607,1610 **** --- 1607,1611 ---- oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.formAllergies=Allergies oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.formAppointmentNotes=Appointment Notes + oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.formLastFollowup=Last Follow Up Date oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnSubmit=Submit Consultation Request oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnSubmitAndPrint=Submit Consultation Request & Print Preview *************** *** 5158,5161 **** --- 5159,5163 ---- oscarEncounter.oscarConsultationRequest.config.EditSpecialists.phone=Phone oscarEncounter.oscarConsultationRequest.config.EditSpecialists.fax=Fax + oscarEncounter.oscarConsultationRequest.config.EditSpecialists.Annotation=Annotation oscarEncounter.oscarConsultationRequest.config.ShowAllServices.title=Select Service |
|
From: Randy J. <rj...@us...> - 2010-11-12 20:56:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32648 Added Files: update-2010-11-12.1.sql Log Message: - ID: 3108150 Add ability to store annotations (note) with a service provider Display team, last follow up date, and specialist name in consultation report Display specialist annotation in consultation request form when specialist is selected --- NEW FILE: update-2010-11-12.1.sql --- alter table professionalSpecialists add column `annotation` text default null; alter table consultationRequests add column `followUpDate` date default null; |
|
From: Jay G. <jay...@us...> - 2010-11-12 20:41:35
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27594 Modified Files: demographiccontrol.jsp demographiceditdemographic.jsp demographicupdatearecord.jsp Log Message: ID: 3108108 -- Roster Date is an inactive field on the demographic screen. --Changed SQL for a new roster field. --enabled roster date on demographic edit screen --Added logic to process roster field from edit demographic screen Index: demographiccontrol.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographiccontrol.jsp,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** demographiccontrol.jsp 8 Oct 2010 14:24:53 -0000 1.67 --- demographiccontrol.jsp 12 Nov 2010 20:41:27 -0000 1.68 *************** *** 98,102 **** {"search_detail", "select * from demographic where demographic_no=?"}, {"search_detail_ptbr", "select * from demographic d left outer join demographic_ptbr dptbr on dptbr.demographic_no = d.demographic_no where d.demographic_no=?"}, ! {"update_record", "update demographic set last_name=?,first_name=?,address=?,city=?,province=?,postal=?,phone=?,phone2=?,email=?,pin=?,year_of_birth=?,month_of_birth=?,date_of_birth=?,hin=?,ver=?,roster_status=?,patient_status=?,chart_no=?,provider_no=?,sex=?,pcn_indicator=?,hc_type=?,family_doctor=?,country_of_origin=?,newsletter=?,sin=?,title=?,official_lang=?,spoken_lang=?,lastUpdateUser=?,lastUpdateDate=now(),date_joined=?,end_date=?,eff_date=?,hc_renew_date=? where demographic_no=?"}, {"update_record_ptbr", "update demographic_ptbr set cpf=?,rg=?,chart_address=?,marriage_certificate=?,birth_certificate=?,marital_state=?,partner_name=?,father_name=?,mother_name=?,district=?,address_no=?,complementary_address=? where demographic_no=?"}, {"archive_record", "insert into demographicArchive (select * from demographic where demographic_no=?)" }, --- 98,102 ---- {"search_detail", "select * from demographic where demographic_no=?"}, {"search_detail_ptbr", "select * from demographic d left outer join demographic_ptbr dptbr on dptbr.demographic_no = d.demographic_no where d.demographic_no=?"}, ! {"update_record", "update demographic set last_name=?,first_name=?,address=?,city=?,province=?,postal=?,phone=?,phone2=?,email=?,pin=?,year_of_birth=?,month_of_birth=?,date_of_birth=?,hin=?,ver=?,roster_status=?,patient_status=?,chart_no=?,provider_no=?,sex=?,pcn_indicator=?,hc_type=?,family_doctor=?,country_of_origin=?,newsletter=?,sin=?,title=?,official_lang=?,spoken_lang=?,lastUpdateUser=?,lastUpdateDate=now(),date_joined=?,end_date=?,eff_date=?,hc_renew_date=?,roster_date=? where demographic_no=?"}, {"update_record_ptbr", "update demographic_ptbr set cpf=?,rg=?,chart_address=?,marriage_certificate=?,birth_certificate=?,marital_state=?,partner_name=?,father_name=?,mother_name=?,district=?,address_no=?,complementary_address=? where demographic_no=?"}, {"archive_record", "insert into demographicArchive (select * from demographic where demographic_no=?)" }, Index: demographicupdatearecord.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographicupdatearecord.jsp,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** demographicupdatearecord.jsp 8 Oct 2010 14:28:03 -0000 1.57 --- demographicupdatearecord.jsp 12 Nov 2010 20:41:27 -0000 1.58 *************** *** 93,97 **** param[29]=(String)session.getAttribute("user"); ! java.sql.Date [] dtparam = new java.sql.Date[4]; String yearTmp=StringUtils.trimToNull(request.getParameter("date_joined_year")); --- 93,97 ---- param[29]=(String)session.getAttribute("user"); ! java.sql.Date [] dtparam = new java.sql.Date[5]; String yearTmp=StringUtils.trimToNull(request.getParameter("date_joined_year")); *************** *** 142,146 **** dtparam[3]=null; } ! int []intparam=new int[] {Integer.parseInt(request.getParameter("demographic_no"))}; --- 142,159 ---- dtparam[3]=null; } ! ! yearTmp=StringUtils.trimToNull(request.getParameter("roster_date_year")); ! monthTmp=StringUtils.trimToNull(request.getParameter("roster_date_month")); ! dayTmp=StringUtils.trimToNull(request.getParameter("roster_date_day")); ! ! if( yearTmp != null && monthTmp!=null && dayTmp!=null ) ! { ! dtparam[4]=MyDateFormat.getSysDate(yearTmp+'-'+monthTmp+'-'+dayTmp); ! } ! else ! { ! dtparam[4]=null; ! } ! int []intparam=new int[] {Integer.parseInt(request.getParameter("demographic_no"))}; Index: demographiceditdemographic.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographiceditdemographic.jsp,v retrieving revision 1.158 retrieving revision 1.159 diff -C2 -d -r1.158 -r1.159 *** demographiceditdemographic.jsp 12 Nov 2010 17:14:50 -0000 1.158 --- demographiceditdemographic.jsp 12 Nov 2010 20:41:27 -0000 1.159 *************** *** 1095,1099 **** <span class="label"><bean:message key="demographic.demographiceditdemographic.DateJoined" />:</span> ! <span class="info"><%=MyDateFormat.getMyStandardDate(apptMainBean.getString(rs,"hc_renew_date"))%></span> </li> <li><span class="label"><bean:message --- 1095,1099 ---- <span class="label"><bean:message key="demographic.demographiceditdemographic.DateJoined" />:</span> ! <span class="info"><%=MyDateFormat.getMyStandardDate(apptMainBean.getString(rs,"roster_date"))%></span> </li> <li><span class="label"><bean:message *************** *** 1964,1970 **** key="demographic.demographiceditdemographic.DateJoined" />: </b></td> <td align="left"> ! <input disabled="disabled" type="text" name="" size="4" maxlength="4" value=""> ! <input disabled="disabled" type="text" name="" size="2" maxlength="2" value=""> ! <input disabled="disabled" type="text" name="" size="2" maxlength="2" value=""> </td> </tr> --- 1964,1989 ---- key="demographic.demographiceditdemographic.DateJoined" />: </b></td> <td align="left"> ! <% ! // Put 0 on the left on dates ! // Year ! decF.applyPattern("0000"); ! ! GregorianCalendar rosterDateCal=new GregorianCalendar(); ! String rosterDateYear=""; ! String rosterDateMonth=""; ! String rosterDateDay=""; ! if (demographic.getRosterDate()!=null){ ! rosterDateCal.setTime(demographic.getRosterDate()); ! rosterDateYear = decF.format(rosterDateCal.get(GregorianCalendar.YEAR)); ! // Month and Day ! decF.applyPattern("00"); ! rosterDateMonth = decF.format(rosterDateCal.get(GregorianCalendar.MONTH)+1); ! rosterDateDay = decF.format(rosterDateCal.get(GregorianCalendar.DAY_OF_MONTH)); ! } ! %> ! ! <input type="text" name="roster_date_year" size="4" maxlength="4" value="<%=rosterDateYear%>"> ! <input type="text" name="roster_date_month" size="2" maxlength="2" value="<%=rosterDateMonth%>"> ! <input type="text" name="roster_date_day" size="2" maxlength="2" value="<%=rosterDateDay%>"> </td> </tr> |
|
From: Jay G. <jay...@us...> - 2010-11-12 20:38:53
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv26308/updates Modified Files: update-2010-11-12.sql Log Message: ID: 3108108 -- Roster Date is an inactive field on the demographic screen. Added roster_date field to demographic table. Added roster_date field to demographicArchive table FIXED Index: update-2010-11-12.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates/update-2010-11-12.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** update-2010-11-12.sql 12 Nov 2010 19:04:37 -0000 1.1 --- update-2010-11-12.sql 12 Nov 2010 20:38:45 -0000 1.2 *************** *** 1,3 **** alter table demographic add roster_date date; ! update table demographic set roster_date = hc_renew_date; \ No newline at end of file --- 1,5 ---- alter table demographic add roster_date date; ! update table demographic set roster_date = hc_renew_date; ! ! alter table demographicArchive add column roster_date date; \ No newline at end of file |
|
From: Jay G. <jay...@us...> - 2010-11-12 20:38:53
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv26308 Modified Files: oscarinit.sql Log Message: ID: 3108108 -- Roster Date is an inactive field on the demographic screen. Added roster_date field to demographic table. Added roster_date field to demographicArchive table FIXED Index: oscarinit.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v retrieving revision 1.268 retrieving revision 1.269 diff -C2 -d -r1.268 -r1.269 *** oscarinit.sql 12 Nov 2010 19:04:37 -0000 1.268 --- oscarinit.sql 12 Nov 2010 20:38:45 -0000 1.269 *************** *** 8046,8049 **** --- 8046,8050 ---- ver char(3), roster_status varchar(20), + roster_date date, patient_status varchar(20), date_joined date, |
|
From: jai <yg...@us...> - 2010-11-12 20:27:52
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/util In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22505 Modified Files: RxUtil.java Log Message: -ID: 3108111 -escape drug name Index: RxUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/util/RxUtil.java,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** RxUtil.java 11 Nov 2010 01:35:10 -0000 1.44 --- RxUtil.java 12 Nov 2010 20:27:44 -0000 1.45 *************** *** 1341,1345 **** //query the database to see if there is a rx with same din as this rx. // String sql = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' order by written_date desc"; //most recent is the first. ! String sql = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' and BN='"+rx.getBrandName()+"' AND demographic_no="+rx.getDemographicNo()+" order by drugid desc"; //most recent is the first. MiscUtils.getLogger().debug("sql 1="+sql); rs = DBHandler.GetSQL(sql); --- 1341,1345 ---- //query the database to see if there is a rx with same din as this rx. // String sql = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' order by written_date desc"; //most recent is the first. ! String sql = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' and BN='"+StringEscapeUtils.escapeSql(rx.getBrandName())+"' AND demographic_no="+rx.getDemographicNo()+" order by drugid desc"; //most recent is the first. MiscUtils.getLogger().debug("sql 1="+sql); rs = DBHandler.GetSQL(sql); *************** *** 1347,1351 **** setResultSpecialQuantityRepeat(rx, rs); } else { ! String sql2 = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' and BN='"+rx.getBrandName()+"' order by drugid desc"; //most recent is the first. MiscUtils.getLogger().debug("sql 2="+sql2); rs = DBHandler.GetSQL(sql2); --- 1347,1351 ---- setResultSpecialQuantityRepeat(rx, rs); } else { ! String sql2 = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' and BN='"+StringEscapeUtils.escapeSql(rx.getBrandName())+"' order by drugid desc"; //most recent is the first. MiscUtils.getLogger().debug("sql 2="+sql2); rs = DBHandler.GetSQL(sql2); |
|
From: jai <yg...@us...> - 2010-11-12 20:27:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22300 Modified Files: prescribe.jsp Log Message: -ID: 3108111 -replace quotation with escape character Index: prescribe.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/prescribe.jsp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** prescribe.jsp 4 Nov 2010 15:11:03 -0000 1.41 --- prescribe.jsp 12 Nov 2010 20:27:02 -0000 1.42 *************** *** 101,104 **** --- 101,107 ---- if(prn) prnStr="prn"; + drugName=drugName.replace("'", "\\'"); + drugName=drugName.replace("\"","\\\""); + %> *************** *** 196,200 **** } showHideSpecInst=function showHideSpecInst(elementId){ - oscarLog("in show hide spec inst="+elementId); if($(elementId).getStyle('display')=='none'){ Effect.BlindDown(elementId); --- 199,202 ---- |
|
From: jai <yg...@us...> - 2010-11-12 20:03:40
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14949 Modified Files: Tag: RELEASE_10_06 prescribe.jsp Log Message: -ID: 3108111 -replace quotation with escape character Index: prescribe.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/prescribe.jsp,v retrieving revision 1.37.2.3 retrieving revision 1.37.2.4 diff -C2 -d -r1.37.2.3 -r1.37.2.4 *** prescribe.jsp 4 Nov 2010 15:26:47 -0000 1.37.2.3 --- prescribe.jsp 12 Nov 2010 20:03:32 -0000 1.37.2.4 *************** *** 101,104 **** --- 101,107 ---- if(prn) prnStr="prn"; + drugName=drugName.replace("'", "\\'"); + drugName=drugName.replace("\"","\\\""); + %> |
|
From: jai <yg...@us...> - 2010-11-12 20:03:02
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/util In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14765 Modified Files: Tag: RELEASE_10_06 RxUtil.java Log Message: -ID: 3108111 -escape drug name Index: RxUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/util/RxUtil.java,v retrieving revision 1.34.4.1 retrieving revision 1.34.4.2 diff -C2 -d -r1.34.4.1 -r1.34.4.2 *** RxUtil.java 9 Jul 2010 15:33:24 -0000 1.34.4.1 --- RxUtil.java 12 Nov 2010 20:02:54 -0000 1.34.4.2 *************** *** 1343,1347 **** //query the database to see if there is a rx with same din as this rx. // String sql = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' order by written_date desc"; //most recent is the first. ! String sql = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' and BN='"+rx.getBrandName()+"' AND demographic_no="+rx.getDemographicNo()+" order by drugid desc"; //most recent is the first. System.out.println("sql 1="+sql); rs = db.GetSQL(sql); --- 1343,1347 ---- //query the database to see if there is a rx with same din as this rx. // String sql = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' order by written_date desc"; //most recent is the first. ! String sql = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' and BN='"+StringEscapeUtils.escapeSql(rx.getBrandName())+"' AND demographic_no="+rx.getDemographicNo()+" order by drugid desc"; //most recent is the first. System.out.println("sql 1="+sql); rs = db.GetSQL(sql); *************** *** 1349,1353 **** setResultSpecialQuantityRepeat(rx, rs); } else { ! String sql2 = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' and BN='"+rx.getBrandName()+"' order by drugid desc"; //most recent is the first. System.out.println("sql 2="+sql2); rs = db.GetSQL(sql2); --- 1349,1353 ---- setResultSpecialQuantityRepeat(rx, rs); } else { ! String sql2 = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' and BN='"+StringEscapeUtils.escapeSql(rx.getBrandName())+"' order by drugid desc"; //most recent is the first. System.out.println("sql 2="+sql2); rs = db.GetSQL(sql2); |
|
From: jai <yg...@us...> - 2010-11-12 19:09:24
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/util In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32353 Modified Files: Tag: RELEASE_9_12 RxUtil.java Log Message: -ID: 3108111 -escape drug name Index: RxUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/util/RxUtil.java,v retrieving revision 1.16.2.24 retrieving revision 1.16.2.25 diff -C2 -d -r1.16.2.24 -r1.16.2.25 *** RxUtil.java 10 Aug 2010 14:01:42 -0000 1.16.2.24 --- RxUtil.java 12 Nov 2010 19:09:16 -0000 1.16.2.25 *************** *** 1136,1140 **** rx.setRepeat(0); ! } private static void setResultSpecialQuantityRepeat(RxPrescriptionData.Prescription rx, ResultSet rs) { --- 1136,1140 ---- rx.setRepeat(0); ! } private static void setResultSpecialQuantityRepeat(RxPrescriptionData.Prescription rx, ResultSet rs) { *************** *** 1343,1347 **** //query the database to see if there is a rx with same din as this rx. // String sql = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' order by written_date desc"; //most recent is the first. ! String sql = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' and BN='"+rx.getBrandName()+"' AND demographic_no="+rx.getDemographicNo()+" order by drugid desc"; //most recent is the first. System.out.println("sql 1="+sql); rs = db.GetSQL(sql); --- 1343,1347 ---- //query the database to see if there is a rx with same din as this rx. // String sql = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' order by written_date desc"; //most recent is the first. ! String sql = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' and BN='"+StringEscapeUtils.escapeSql(rx.getBrandName())+"' AND demographic_no="+rx.getDemographicNo()+" order by drugid desc"; //most recent is the first. System.out.println("sql 1="+sql); rs = db.GetSQL(sql); *************** *** 1349,1353 **** setResultSpecialQuantityRepeat(rx, rs); } else { ! String sql2 = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' and BN='"+rx.getBrandName()+"' order by drugid desc"; //most recent is the first. System.out.println("sql 2="+sql2); rs = db.GetSQL(sql2); --- 1349,1353 ---- setResultSpecialQuantityRepeat(rx, rs); } else { ! String sql2 = "SELECT * FROM drugs WHERE regional_identifier='" + rx.getRegionalIdentifier() + "' and BN='"+StringEscapeUtils.escapeSql(rx.getBrandName())+"' order by drugid desc"; //most recent is the first. System.out.println("sql 2="+sql2); rs = db.GetSQL(sql2); |
|
From: jai <yg...@us...> - 2010-11-12 19:08:58
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32237 Modified Files: Tag: RELEASE_9_12 prescribe.jsp Log Message: -ID: 3108111 -replace quotation with escape character Index: prescribe.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/prescribe.jsp,v retrieving revision 1.18.2.26 retrieving revision 1.18.2.27 diff -C2 -d -r1.18.2.26 -r1.18.2.27 *** prescribe.jsp 4 Nov 2010 14:50:36 -0000 1.18.2.26 --- prescribe.jsp 12 Nov 2010 19:08:50 -0000 1.18.2.27 *************** *** 103,106 **** --- 103,109 ---- if(prn) prnStr="prn"; + drugName=drugName.replace("'", "\\'"); + drugName=drugName.replace("\"","\\\""); + %> *************** *** 182,187 **** </fieldset> ! <script type="text/javascript"> ! $('drugName_'+'<%=rand%>').value=decodeURIComponent(encodeURIComponent('<%=drugName%>')); calculateRxData('<%=rand%>'); handleEnter=function handleEnter(inField, ev){ --- 185,190 ---- </fieldset> ! <script type="text/javascript"> ! $('drugName_'+'<%=rand%>').value=decodeURIComponent(encodeURIComponent('<%=drugName%>')); calculateRxData('<%=rand%>'); handleEnter=function handleEnter(inField, ev){ |
|
From: Jay G. <jay...@us...> - 2010-11-12 19:06:45
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv31818 Modified Files: Demographic.hbm.xml Demographic.java Log Message: ID: 3108108 -- Roster Date is an inactive field on the demographic screen. Added member rosterDate (Date) to Demographic Model Index: Demographic.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/Demographic.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Demographic.java 9 Jul 2010 21:56:35 -0000 1.19 --- Demographic.java 12 Nov 2010 19:06:37 -0000 1.20 *************** *** 78,81 **** --- 78,82 ---- private String yearOfBirth; private Date effDate; + private Date rosterDate; private String links; private DemographicExt[] extras; *************** *** 95,98 **** --- 96,113 ---- private int hsAlertCount = 0; + /** + * @return the rosterDate + */ + public Date getRosterDate() { + return rosterDate; + } + + /** + * @param rosterDate the rosterDate to set + */ + public void setRosterDate(Date rosterDate) { + this.rosterDate = rosterDate; + } + public enum PatientStatus { AC, IN, DE, IC, ID, MO, FI *************** *** 764,767 **** --- 779,798 ---- } + + //NEED TO IMPLEMENT + + // public long getAgeInDays(){ + // return UtilDateUtilities.getNumDays(UtilDateUtilities.calcDate(year_of_birth,month_of_birth,date_of_birth),Calendar.getInstance().getTime()); + // } + // + // + // public int getAgeInMonths(){ + // return UtilDateUtilities.getNumMonths(UtilDateUtilities.calcDate(year_of_birth,month_of_birth,date_of_birth),Calendar.getInstance().getTime()); + // } + // + // public int getAgeInMonthsAsOf(Date asofDate){ + // return UtilDateUtilities.getNumMonths(UtilDateUtilities.calcDate(year_of_birth,month_of_birth,date_of_birth),asofDate); + // } + public int getAgeInYears() { return Utility.getNumYears(Utility.calcDate(Utility.convertToReplaceStrIfEmptyStr(getYearOfBirth(), DEFAULT_YEAR), Utility.convertToReplaceStrIfEmptyStr(getMonthOfBirth(), DEFAULT_MONTH), Utility.convertToReplaceStrIfEmptyStr(getDateOfBirth(), DEFAULT_DATE)), Calendar.getInstance().getTime()); *************** *** 795,798 **** --- 826,837 ---- } + // Implement? + // public String getDob() { + // return addZero(year_of_birth,4)+addZero(month_of_birth,2)+addZero(date_of_birth,2); + // } + // public String getDob(String seperator){ + // return this.getYearOfBirth() + seperator + this.getMonthOfBirth() + seperator + this.getDateOfBirth(); + // } + public String getFormattedLinks() { StringBuilder response = new StringBuilder(); Index: Demographic.hbm.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/Demographic.hbm.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Demographic.hbm.xml 3 Jun 2010 14:55:54 -0000 1.7 --- Demographic.hbm.xml 12 Nov 2010 19:06:37 -0000 1.8 *************** *** 42,45 **** --- 42,46 ---- <property column="end_date" length="10" name="EndDate" type="date" /> <property column="eff_date" length="10" name="EffDate" type="date" /> + <property column="roster_date" length="10" name="rosterDate" type="date"/> <property column="pcn_indicator" length="20" name="PcnIndicator" type="string" /> <property column="family_doctor" length="80" name="FamilyDoctor" type="string" /> |
|
From: Jay G. <jay...@us...> - 2010-11-12 19:04:46
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30829/updates Added Files: update-2010-11-12.sql Log Message: ID: 3108108 -- Roster Date is an inactive field on the demographic screen. Added roster_date field to demographic table. --- NEW FILE: update-2010-11-12.sql --- alter table demographic add roster_date date; update table demographic set roster_date = hc_renew_date; |
|
From: Jay G. <jay...@us...> - 2010-11-12 19:04:45
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30829 Modified Files: oscarinit.sql Log Message: ID: 3108108 -- Roster Date is an inactive field on the demographic screen. Added roster_date field to demographic table. Index: oscarinit.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v retrieving revision 1.267 retrieving revision 1.268 diff -C2 -d -r1.267 -r1.268 *** oscarinit.sql 3 Nov 2010 19:55:29 -0000 1.267 --- oscarinit.sql 12 Nov 2010 19:04:37 -0000 1.268 *************** *** 407,410 **** --- 407,411 ---- ver char(3) default NULL, roster_status varchar(20) default NULL, + roster_date date, patient_status varchar(20) default NULL, date_joined date default NULL, |
|
From: Jay G. <jay...@us...> - 2010-11-12 18:01:41
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDB In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv12274 Modified Files: DBHandler.java Log Message: ID: 3072011 -- fixes for mobile browserCode Clean up: Removed commented out code Index: DBHandler.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDB/DBHandler.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** DBHandler.java 6 Oct 2010 21:52:12 -0000 1.21 --- DBHandler.java 12 Nov 2010 18:01:33 -0000 1.22 *************** *** 54,58 **** stmt = DbConnectionFilter.getThreadLocalDbConnection().createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE); } else { - // stmt = getConnection().createStatement(); stmt = DbConnectionFilter.getThreadLocalDbConnection().createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY); } --- 54,57 ---- |
|
From: Jay G. <jay...@us...> - 2010-11-12 17:14:58
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30549 Modified Files: demographiceditdemographic.jsp Log Message: ID: 3072011 -- fixes for mobile browser Index: demographiceditdemographic.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographiceditdemographic.jsp,v retrieving revision 1.157 retrieving revision 1.158 diff -C2 -d -r1.157 -r1.158 *** demographiceditdemographic.jsp 5 Nov 2010 18:15:37 -0000 1.157 --- demographiceditdemographic.jsp 12 Nov 2010 17:14:50 -0000 1.158 *************** *** 1013,1041 **** <div class="demographicSection" id="demographic"> <h3> <bean:message key="demographic.demographiceditdemographic.msgDemographic"/></h3> - <div style="background-color: #EEEEFF;"> <ul> ! <li><bean:message ! key="demographic.demographiceditdemographic.formLastName" />: <b><%=apptMainBean.getString(rs,"last_name")%></b> <bean:message ! key="demographic.demographiceditdemographic.formFirstName" />: <b> ! <%=apptMainBean.getString(rs,"first_name")%></b></li> ! <li><bean:message key="demographic.demographiceditdemographic.msgDemoTitle"/>:<b><%=apptMainBean.getString(rs,"title")%></b> ! <bean:message key="demographic.demographiceditdemographic.formSex" />:<b><%=apptMainBean.getString(rs,"sex")%></b> </li> ! <li><bean:message key="demographic.demographiceditdemographic.msgDemoAge"/>:<b><%=age%></b> <bean:message ! key="demographic.demographiceditdemographic.formDOB" />:<b>(<%=apptMainBean.getString(rs,"year_of_birth")%>-<%=apptMainBean.getString(rs,"month_of_birth")%>-<%=apptMainBean.getString(rs,"date_of_birth")%>)</b> </li> ! <li><bean:message key="demographic.demographiceditdemographic.msgDemoLanguage"/>: <b><%= apptMainBean.getString(rs,"official_lang")%></b> <% if (apptMainBean.getString(rs,"country_of_origin") != null && !apptMainBean.getString(rs,"country_of_origin").equals("") && !apptMainBean.getString(rs,"country_of_origin").equals("-1")){ CountryCode countryCode = ccDAO.getCountryCode(apptMainBean.getString(rs,"country_of_origin")); if (countryCode != null){ %> ! <bean:message key="demographic.demographiceditdemographic.msgCountryOfOrigin"/>: <b><%=countryCode.getCountryName() %></b> <% } } %> - </li> <% String sp_lang = apptMainBean.getString(rs,"spoken_lang"); if (sp_lang!=null && sp_lang.length()>0) { %> ! <li><bean:message key="demographic.demographiceditdemographic.msgSpokenLang"/>: <b><%=sp_lang%></b> </li> <% } --- 1013,1053 ---- <div class="demographicSection" id="demographic"> <h3> <bean:message key="demographic.demographiceditdemographic.msgDemographic"/></h3> <ul> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formLastName" />:</span> ! <span class="info"><%=apptMainBean.getString(rs,"last_name")%></span> ! </li> ! <li><span class="label"> <bean:message ! key="demographic.demographiceditdemographic.formFirstName" />:</span> ! <span class="info"><%=apptMainBean.getString(rs,"first_name")%></span> </li> ! <li><span class="label"><bean:message key="demographic.demographiceditdemographic.msgDemoTitle"/>:</span> ! <span class="info"><%=apptMainBean.getString(rs,"title")%></span> </li> ! <li><span class="label"><bean:message key="demographic.demographiceditdemographic.formSex" />:</span> ! <span class="info"><%=apptMainBean.getString(rs,"sex")%></span> ! </li> ! <li><span class="label"><bean:message key="demographic.demographiceditdemographic.msgDemoAge"/>:</span> ! <span class="info"><%=age%> (<bean:message ! key="demographic.demographiceditdemographic.formDOB" />: <%=apptMainBean.getString(rs,"year_of_birth")%>-<%=apptMainBean.getString(rs,"month_of_birth")%>-<%=apptMainBean.getString(rs,"date_of_birth")%>) ! </span> ! </li> ! <li><span class="label"><bean:message key="demographic.demographiceditdemographic.msgDemoLanguage"/>:</span> ! <span class="info"><%= apptMainBean.getString(rs,"official_lang")%></span> ! </li> <% if (apptMainBean.getString(rs,"country_of_origin") != null && !apptMainBean.getString(rs,"country_of_origin").equals("") && !apptMainBean.getString(rs,"country_of_origin").equals("-1")){ CountryCode countryCode = ccDAO.getCountryCode(apptMainBean.getString(rs,"country_of_origin")); if (countryCode != null){ %> ! <li><span class="label"><bean:message key="demographic.demographiceditdemographic.msgCountryOfOrigin"/>:</span> ! <span class="info"><%=countryCode.getCountryName() %></span> ! </li><% } } %> <% String sp_lang = apptMainBean.getString(rs,"spoken_lang"); if (sp_lang!=null && sp_lang.length()>0) { %> ! <li><span class="label"><bean:message key="demographic.demographiceditdemographic.msgSpokenLang"/>:</span> ! <span class="info"><%=sp_lang%></span> </li> <% } *************** *** 1051,1062 **** </ul> </div> - </div> ! <div class="demographicSection"> <h3> <bean:message key="demographic.demographiceditdemographic.msgOtherContacts"/>: <b><a href="javascript: function myFunction() {return false; }" onClick="popup(700,960,'AddAlternateContact.jsp?demo=<%=apptMainBean.getString(rs,"demographic_no")%>','AddRelation')"> <bean:message key="demographic.demographiceditdemographic.msgAddRelation"/><!--i18n--></a></b></h3> - <div style="background-color: #EEEEFF;"> <ul> <%DemographicRelationship demoRelation = new DemographicRelationship(); --- 1063,1072 ---- </ul> </div> ! <div class="demographicSection" id="otherContacts"> <h3> <bean:message key="demographic.demographiceditdemographic.msgOtherContacts"/>: <b><a href="javascript: function myFunction() {return false; }" onClick="popup(700,960,'AddAlternateContact.jsp?demo=<%=apptMainBean.getString(rs,"demographic_no")%>','AddRelation')"> <bean:message key="demographic.demographiceditdemographic.msgAddRelation"/><!--i18n--></a></b></h3> <ul> <%DemographicRelationship demoRelation = new DemographicRelationship(); *************** *** 1068,1090 **** %> ! <li><b><%=relHash.get("relation")%><%=sdb%><%=ec%>: </b><%=relHash.get("lastName")%>, ! <%=relHash.get("firstName")%> ,<%=relHash.get("phone")%></li> <%}%> </ul> </div> - </div> ! <div class="demographicSection"> <h3> <bean:message key="demographic.demographiceditdemographic.msgClinicStatus"/></h3> - <div style="background-color: #EEEEFF;"> <ul> ! <li><bean:message ! key="demographic.demographiceditdemographic.formRosterStatus" />: ! <b><%=apptMainBean.getString(rs,"roster_status")%></b> <bean:message ! key="demographic.demographiceditdemographic.DateJoined" />: <b><%=MyDateFormat.getMyStandardDate(apptMainBean.getString(rs,"hc_renew_date"))%></b> </li> ! ! <li> <% String PatStat = rs.getString("patient_status"); --- 1078,1103 ---- %> ! <li><span class="label"><%=relHash.get("relation")%><%=sdb%><%=ec%>:</span> ! <span class="info"><%=relHash.get("lastName")%>, <%=relHash.get("firstName")%>, <%=relHash.get("phone")%></span> ! </li> <%}%> </ul> </div> ! <div class="demographicSection" id="clinicStatus"> <h3> <bean:message key="demographic.demographiceditdemographic.msgClinicStatus"/></h3> <ul> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formRosterStatus" />:</span> ! <span class="info"><%=apptMainBean.getString(rs,"roster_status")%></span> ! </li><li> ! <span class="label"><bean:message ! key="demographic.demographiceditdemographic.DateJoined" />:</span> ! <span class="info"><%=MyDateFormat.getMyStandardDate(apptMainBean.getString(rs,"hc_renew_date"))%></span> </li> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formPatientStatus" />:</span> ! <span class="info"> <% String PatStat = rs.getString("patient_status"); *************** *** 1093,1231 **** if ( PatStat.equals(Dead) ) {%> ! <div style="color: #FF0000;"><bean:message ! key="demographic.demographiceditdemographic.formPatientStatus" />: <b><%=rs.getString("patient_status")%></b></div> <%} else if (PatStat.equals(Inactive) ){%> ! <div style="color: #0000FF;"><bean:message ! key="demographic.demographiceditdemographic.formPatientStatus" />: <b><%=rs.getString("patient_status")%></b></div> ! <%} else {%> <bean:message ! key="demographic.demographiceditdemographic.formPatientStatus" />: <b><%=rs.getString("patient_status")%></b> <%}%> ! </li> ! <li><bean:message ! key="demographic.demographiceditdemographic.formChartNo" />: <b><%=apptMainBean.getString(rs,"chart_no")%></b> </li> <% if (oscarProps.isPropertyActive("meditech_id")) { %> ! <li>Meditech ID: <b><%=OtherIdManager.getDemoOtherId(demographic_no, "meditech_id")%></b> </li> <% } %> ! <li><bean:message ! key="demographic.demographiceditdemographic.cytolNum" />: <b> ! <%=apptMainBean.getString(demoExt.get("cytolNum"))%></b></li> ! <li><bean:message ! key="demographic.demographiceditdemographic.formDateJoined1" />: ! <b><%=MyDateFormat.getMyStandardDate(apptMainBean.getString(rs,"date_joined"))%></b> ! <bean:message ! key="demographic.demographiceditdemographic.formEndDate" />: <b><%=MyDateFormat.getMyStandardDate(apptMainBean.getString(rs,"end_date"))%></b> </li> </ul> </div> - </div> ! <div class="demographicSection"> <h3> <bean:message key="demographic.demographiceditdemographic.formAlert" /></h3> ! <div style="background-color: #EEEEFF; color: red;"><%=alert%> ! </div> </div> </div> ! <div style="width: 49%; float: left; margin-left: 5px;"> ! <div class="demographicSection" style="margin-top: 2px;"> <h3> <bean:message key="demographic.demographiceditdemographic.msgContactInfo"/></h3> - <div style="background-color: #EEEEFF;"> <ul> ! <li><bean:message ! key="demographic.demographiceditdemographic.formPhoneH" />:<b><%=apptMainBean.getString(rs,"phone")%> ! <%=apptMainBean.getString(demoExt.get("hPhoneExt"))%></b> <bean:message ! key="demographic.demographiceditdemographic.formPhoneW" />:<b> ! <%=apptMainBean.getString(rs,"phone2")%> <%=apptMainBean.getString(demoExt.get("wPhoneExt"))%></b> ! ! </li> ! <li><bean:message ! key="demographic.demographiceditdemographic.formPhoneC" />:<b> ! <%=apptMainBean.getString(demoExt.get("demo_cell"))%></b></li> ! <li><bean:message ! key="demographic.demographiceditdemographic.formAddr" />: <b><%=apptMainBean.getString(rs,"address")%></b> </li> ! <li><bean:message ! key="demographic.demographiceditdemographic.formCity" />: <b><%=apptMainBean.getString(rs,"city")%></b> </li> ! <li> <% if(oscarProps.getProperty("demographicLabelProvince") == null) { %> <bean:message key="demographic.demographiceditdemographic.formProcvince" /> <% } else { out.print(oscarProps.getProperty("demographicLabelProvince")); ! } %> : <b> <%=apptMainBean.getString(rs,"province")%></b></li> ! <li> <% if(oscarProps.getProperty("demographicLabelPostal") == null) { %> <bean:message key="demographic.demographiceditdemographic.formPostal" /> <% } else { out.print(oscarProps.getProperty("demographicLabelPostal")); ! } %> : <b> <%=apptMainBean.getString(rs,"postal")%></b></li> ! <li><bean:message ! key="demographic.demographiceditdemographic.formEmail" />: <b> ! <%=apptMainBean.getString(rs,"email")!=null? apptMainBean.getString(rs,"email") : ""%></b> </li> ! <li><bean:message ! key="demographic.demographiceditdemographic.formNewsLetter" />: ! <b> <%=apptMainBean.getString(rs,"newsletter")!=null? apptMainBean.getString(rs,"newsletter") : "Unknown"%></b> </li> </ul> </div> - </div> ! <div class="demographicSection"> <h3> <bean:message key="demographic.demographiceditdemographic.msgHealthIns"/></h3> - <div style="background-color: #EEEEFF;"> <ul> ! <li><bean:message ! key="demographic.demographiceditdemographic.formHin" />: <b><%=apptMainBean.getString(rs,"hin")%> ! <%=apptMainBean.getString(rs,"ver")%></b> <bean:message ! key="demographic.demographiceditdemographic.formHCType" />:<b><%=apptMainBean.getString(rs,"hc_type")==null?"":apptMainBean.getString(rs,"hc_type") %></b> </li> ! <li><bean:message ! key="demographic.demographiceditdemographic.formEFFDate" />:<b><%=MyDateFormat.getMyStandardDate(apptMainBean.getString(rs,"eff_date"))%></b> </li> </ul> </div> - </div> ! <div class="demographicSection"> <h3> <bean:message key="demographic.demographiceditdemographic.msgPatientClinicStatus"/></h3> - <div style="background-color: #EEEEFF;"> <ul> ! <li> <% if(oscarProps.getProperty("demographicLabelDoctor") != null) { out.print(oscarProps.getProperty("demographicLabelDoctor","")); } else { %> <bean:message key="demographic.demographiceditdemographic.formDoctor" /> ! <% } %>: <b><%=providerBean.getProperty(apptMainBean.getString(rs,"provider_no"),"")%></b> </li> ! <li><bean:message ! key="demographic.demographiceditdemographic.formNurse" />: <b><%=providerBean.getProperty(resident,"")%></b> </li> ! <li><bean:message ! key="demographic.demographiceditdemographic.formMidwife" />: <b><%=providerBean.getProperty(midwife,"")%></b> </li> ! <li><bean:message ! key="demographic.demographiceditdemographic.formResident" />:<b> ! <%=providerBean.getProperty(nurse,"")%></b></li> ! <li><bean:message ! key="demographic.demographiceditdemographic.formRefDoc" />: <b><%=rd%></b> </li> ! <li><bean:message ! key="demographic.demographiceditdemographic.formRefDocNo" />: <b><%=rdohip%></b> </li> </ul> </div> - </div> ! <div class="demographicSection"> <h3> <bean:message key="demographic.demographiceditdemographic.formNotes" /></h3> ! <div style="background-color: #EEEEFF;"><%=notes%> </div> </div> </div> --- 1106,1250 ---- if ( PatStat.equals(Dead) ) {%> ! <b style="color: #FF0000;"><%=rs.getString("patient_status")%></b> <%} else if (PatStat.equals(Inactive) ){%> ! <b style="color: #0000FF;"><%=rs.getString("patient_status")%></b> ! <%} else {%> ! <%=rs.getString("patient_status")%> <%}%> ! </span> </li> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formChartNo" />:</span> ! <span class="info"><%=apptMainBean.getString(rs,"chart_no")%></span> </li> <% if (oscarProps.isPropertyActive("meditech_id")) { %> ! <li><span class="label">Meditech ID:</span> ! <span class="info"><%=OtherIdManager.getDemoOtherId(demographic_no, "meditech_id")%></span> </li> <% } %> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.cytolNum" />:</span> ! <span class="info"><%=apptMainBean.getString(demoExt.get("cytolNum"))%></span></li> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formDateJoined1" />:</span> ! <span class="info"><%=MyDateFormat.getMyStandardDate(apptMainBean.getString(rs,"date_joined"))%></span> ! </li><li> ! <span class="label"><bean:message ! key="demographic.demographiceditdemographic.formEndDate" />:</span> ! <span class="info"><%=MyDateFormat.getMyStandardDate(apptMainBean.getString(rs,"end_date"))%></span> </li> </ul> </div> ! <div class="demographicSection" id="alert"> <h3> <bean:message key="demographic.demographiceditdemographic.formAlert" /></h3> ! <ul><li><b style="color: brown;"><%=alert%></b></li></ul> ! </div> </div> ! <div class="rightSection"> ! <div class="demographicSection" id="contactInformation"> <h3> <bean:message key="demographic.demographiceditdemographic.msgContactInfo"/></h3> <ul> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formPhoneH" />:</span> ! <span class="info"><%=apptMainBean.getString(rs,"phone")%> <%=apptMainBean.getString(demoExt.get("hPhoneExt"))%></span> </li> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formPhoneW" />:</span> ! <span class="info"><%=apptMainBean.getString(rs,"phone2")%> <%=apptMainBean.getString(demoExt.get("wPhoneExt"))%></span> </li> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formPhoneC" />:</span> ! <span class="info"><%=apptMainBean.getString(demoExt.get("demo_cell"))%></span></li> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formAddr" />:</span> ! <span class="info"><%=apptMainBean.getString(rs,"address")%></span> </li> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formCity" />:</span> ! <span class="info"><%=apptMainBean.getString(rs,"city")%></span> ! </li> ! <li><span class="label"> <% if(oscarProps.getProperty("demographicLabelProvince") == null) { %> <bean:message key="demographic.demographiceditdemographic.formProcvince" /> <% } else { out.print(oscarProps.getProperty("demographicLabelProvince")); ! } %>:</span> ! <span class="info"><%=apptMainBean.getString(rs,"province")%></span></li> ! <li><span class="label"> <% if(oscarProps.getProperty("demographicLabelPostal") == null) { %> <bean:message key="demographic.demographiceditdemographic.formPostal" /> <% } else { out.print(oscarProps.getProperty("demographicLabelPostal")); ! } %>:</span> ! <span class="info"><%=apptMainBean.getString(rs,"postal")%></span></li> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formEmail" />:</span> ! <span class="info"><%=apptMainBean.getString(rs,"email")!=null? apptMainBean.getString(rs,"email") : ""%></span> </li> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formNewsLetter" />:</span> ! <span class="info"><%=apptMainBean.getString(rs,"newsletter")!=null? apptMainBean.getString(rs,"newsletter") : "Unknown"%></span> </li> </ul> </div> ! <div class="demographicSection" id="healthInsurance"> <h3> <bean:message key="demographic.demographiceditdemographic.msgHealthIns"/></h3> <ul> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formHin" />:</span> ! <span class="info"><%=apptMainBean.getString(rs,"hin")%> ! <%=apptMainBean.getString(rs,"ver")%></span> </li> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formHCType" />:</span> ! <span class="info"><%=apptMainBean.getString(rs,"hc_type")==null?"":apptMainBean.getString(rs,"hc_type") %></span> </li> + <li><span class="label"><bean:message + key="demographic.demographiceditdemographic.formEFFDate" />:</span> + <span class="info"><%=MyDateFormat.getMyStandardDate(apptMainBean.getString(rs,"eff_date"))%></span> + </li> </ul> </div> ! <div class="demographicSection" id="patientClinicStatus"> <h3> <bean:message key="demographic.demographiceditdemographic.msgPatientClinicStatus"/></h3> <ul> ! <li><span class="label"> <% if(oscarProps.getProperty("demographicLabelDoctor") != null) { out.print(oscarProps.getProperty("demographicLabelDoctor","")); } else { %> <bean:message key="demographic.demographiceditdemographic.formDoctor" /> ! <% } %>:</span><span class="info"><%=providerBean.getProperty(apptMainBean.getString(rs,"provider_no"),"")%></span> </li> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formNurse" />:</span><span class="info"><%=providerBean.getProperty(resident,"")%></span> </li> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formMidwife" />:</span><span class="info"><%=providerBean.getProperty(midwife,"")%></span> </li> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formResident" />:</span> ! <span class="info"><%=providerBean.getProperty(nurse,"")%></span></li> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formRefDoc" />:</span><span class="info"><%=rd%></span> </li> ! <li><span class="label"><bean:message ! key="demographic.demographiceditdemographic.formRefDocNo" />:</span><span class="info"><%=rdohip%></span> </li> </ul> </div> ! <div class="demographicSection" id="notes"> <h3> <bean:message key="demographic.demographiceditdemographic.formNotes" /></h3> ! <ul><li> ! <%=notes%> ! </li></ul> </div> </div> *************** *** 1236,1246 **** String [] propDemoExt = oscarVariables.getProperty("demographicExt","").split("\\|"); %> ! <div class="demographicSection"> <h3> Special</h3> - <div style="background-color: #EEEEFF;"> <% for(int k=0; k<propDemoExt.length; k++) {%> <%=propDemoExt[k]+": <b>" + apptMainBean.getString(demoExt.get(propDemoExt[k].replace(' ', '_'))) +"</b>"%> <%=((k+1)%4==0&&(k+1)<propDemoExt.length)?"<br>":"" %> <% } %> </div> - </div> <% } %> </div> --- 1255,1263 ---- String [] propDemoExt = oscarVariables.getProperty("demographicExt","").split("\\|"); %> ! <div class="demographicSection" id="special"> <h3> Special</h3> <% for(int k=0; k<propDemoExt.length; k++) {%> <%=propDemoExt[k]+": <b>" + apptMainBean.getString(demoExt.get(propDemoExt[k].replace(' ', '_'))) +"</b>"%> <%=((k+1)%4==0&&(k+1)<propDemoExt.length)?"<br>":"" %> <% } %> </div> <% } %> </div> *************** *** 1664,1676 **** GregorianCalendar hcRenewalCal=new GregorianCalendar(); ! ! if(demographic != null && demographic.getHcRenewDate() != null){ hcRenewalCal.setTime(demographic.getHcRenewDate()); ! } ! String renewDateYear = decF.format(hcRenewalCal.get(GregorianCalendar.YEAR)); // Month and Day decF.applyPattern("00"); ! String renewDateMonth = decF.format(hcRenewalCal.get(GregorianCalendar.MONTH)+1); ! String renewDateDay = decF.format(hcRenewalCal.get(GregorianCalendar.DAY_OF_MONTH)); %> --- 1681,1696 ---- GregorianCalendar hcRenewalCal=new GregorianCalendar(); ! String renewDateYear=""; ! String renewDateMonth=""; ! String renewDateDay=""; ! if (demographic.getHcRenewDate()!=null) ! { hcRenewalCal.setTime(demographic.getHcRenewDate()); ! renewDateYear = decF.format(hcRenewalCal.get(GregorianCalendar.YEAR)); // Month and Day decF.applyPattern("00"); ! renewDateMonth = decF.format(hcRenewalCal.get(GregorianCalendar.MONTH)+1); ! renewDateDay = decF.format(hcRenewalCal.get(GregorianCalendar.DAY_OF_MONTH)); ! } %> *************** *** 1898,1904 **** value="<%=rd%>"> <% } %> </td> ! <td align="right" nowrap><b><bean:message key="demographic.demographiceditdemographic.formRefDocNo" />: </b></td> ! <td align="left"><input type="text" name="r_doctor_ohip" size="20" maxlength="6" value="<%=rdohip%>"> ! <a href="javascript:referralScriptAttach2('r_doctor_ohip','r_doctor')"><bean:message key="demographic.demographiceditdemographic.btnSearch"/> #</a> </td> </tr> --- 1918,1928 ---- value="<%=rd%>"> <% } %> </td> ! <td align="right" nowrap><b><bean:message ! key="demographic.demographiceditdemographic.formRefDocNo" />: </b></td> ! <td align="left"><input type="text" name="r_doctor_ohip" ! size="20" maxlength="6" value="<%=rdohip%>"> <% if("ON".equals(prov)) { %> ! <a ! href="javascript:referralScriptAttach2('r_doctor_ohip','r_doctor')"><bean:message key="demographic.demographiceditdemographic.btnSearch"/> ! #</a> <% } %> </td> </tr> |
|
From: Jay G. <jay...@us...> - 2010-11-12 16:32:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv16144 Modified Files: RxPrescriptionData.java Log Message: Code Clean up: Removed commented out code Index: RxPrescriptionData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data/RxPrescriptionData.java,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** RxPrescriptionData.java 11 Nov 2010 01:35:10 -0000 1.68 --- RxPrescriptionData.java 12 Nov 2010 16:32:10 -0000 1.69 *************** *** 607,612 **** rs = DBHandler.GetSQL(sql); ! // java.sql.Connection conn = db.getConnection(); ! // conn.createStatement() while (rs.next()) { --- 607,611 ---- rs = DBHandler.GetSQL(sql); ! while (rs.next()) { |
|
From: Marc D. <hex...@us...> - 2010-11-11 19:56:31
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17873/web/provider Modified Files: Tag: RELEASE_9_12 appointmentprovideradminday.jsp Log Message: backporting the prevention warnings into 9_12 for st. joes Index: appointmentprovideradminday.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v retrieving revision 1.163.2.7 retrieving revision 1.163.2.8 diff -C2 -d -r1.163.2.7 -r1.163.2.8 *** appointmentprovideradminday.jsp 8 Jul 2010 18:02:52 -0000 1.163.2.7 --- appointmentprovideradminday.jsp 11 Nov 2010 19:56:23 -0000 1.163.2.8 *************** *** 1325,1328 **** --- 1325,1329 ---- <% } %> <!-- doctor code block --> + <oscar:oscarPropertiesCheck property="SHOW_PREVENTION_STOP_SIGNS" value="yes" defaultVal="true"> <%String warning = prevMgr.getWarnings(String.valueOf(demographic_no)); String htmlWarning = null; *************** *** 1334,1338 **** } %> ! <%=htmlWarning%><a href=# onClick ="popupPage(400,680,'../appointment/appointmentcontrol.jsp?appointment_no=<%=appointment.get("appointment_no")%>&provider_no=<%=curProvider_no[nProvider]%>&year=<%=year%>&month=<%=month%>&day=<%=day%>&start_time=<%=iS+":"+iSm%>&demographic_no=<%=demographic_no%>&displaymode=edit&dboperation=search');return false;" <oscar:oscarPropertiesCheck property="SHOW_APPT_REASON_TOOLTIP" value="yes" defaultVal="true"> title="<%=name%> reason: <%=UtilMisc.htmlEscape(reason)%> notes: <%=UtilMisc.htmlEscape(notes)%>"</oscar:oscarPropertiesCheck> ><%=(view==0)?(name.length()>len?name.substring(0,len):name):name%></a> --- 1335,1341 ---- } %> ! <%=htmlWarning%> ! </oscar:oscarPropertiesCheck> ! <a href=# onClick ="popupPage(400,680,'../appointment/appointmentcontrol.jsp?appointment_no=<%=appointment.get("appointment_no")%>&provider_no=<%=curProvider_no[nProvider]%>&year=<%=year%>&month=<%=month%>&day=<%=day%>&start_time=<%=iS+":"+iSm%>&demographic_no=<%=demographic_no%>&displaymode=edit&dboperation=search');return false;" <oscar:oscarPropertiesCheck property="SHOW_APPT_REASON_TOOLTIP" value="yes" defaultVal="true"> title="<%=name%> reason: <%=UtilMisc.htmlEscape(reason)%> notes: <%=UtilMisc.htmlEscape(notes)%>"</oscar:oscarPropertiesCheck> ><%=(view==0)?(name.length()>len?name.substring(0,len):name):name%></a> |
|
From: Ted L. <ted...@us...> - 2010-11-11 11:01:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30738/docs Modified Files: setting_up_eclipse_with_tomcat.txt Log Message: amended text so it's more clear Index: setting_up_eclipse_with_tomcat.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/setting_up_eclipse_with_tomcat.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** setting_up_eclipse_with_tomcat.txt 11 Nov 2010 11:00:18 -0000 1.2 --- setting_up_eclipse_with_tomcat.txt 11 Nov 2010 11:01:10 -0000 1.3 *************** *** 30,34 **** - restart the tomcat and it should work (kind of, you need to setup your recaptcha key for the web login if you use that). ! As for how I did that with the integrator, it's a maven project. To build the eclipse project setup for maven its : mvn eclipse:eclipse for a web project it's : mvn eclipse:eclipse -Dwtpversion=1.5 (where the 1.5 is what ever WTP version you're running) --- 30,34 ---- - restart the tomcat and it should work (kind of, you need to setup your recaptcha key for the web login if you use that). ! As for how I did that with the integrator, it's a maven project. To build the eclipse project setup for regular java from maven its : mvn eclipse:eclipse for a web project it's : mvn eclipse:eclipse -Dwtpversion=1.5 (where the 1.5 is what ever WTP version you're running) |
|
From: Ted L. <ted...@us...> - 2010-11-11 11:00:27
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30555/docs Modified Files: setting_up_eclipse_with_tomcat.txt Log Message: amended documentation Index: setting_up_eclipse_with_tomcat.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/setting_up_eclipse_with_tomcat.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** setting_up_eclipse_with_tomcat.txt 11 Nov 2010 10:57:11 -0000 1.1 --- setting_up_eclipse_with_tomcat.txt 11 Nov 2010 11:00:18 -0000 1.2 *************** *** 28,32 **** - Check out the new integrator code.... - add the integrator to your server -> tomcat V6.0 ... ! - restart the tomcat and it should work (kind of, you need to setup your recaptcha key). As for how I did that with the integrator, it's a maven project. To build the eclipse project setup for maven its : mvn eclipse:eclipse --- 28,32 ---- - Check out the new integrator code.... - add the integrator to your server -> tomcat V6.0 ... ! - restart the tomcat and it should work (kind of, you need to setup your recaptcha key for the web login if you use that). As for how I did that with the integrator, it's a maven project. To build the eclipse project setup for maven its : mvn eclipse:eclipse |
