You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(95) |
Dec
(207) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(106) |
Feb
(69) |
Mar
(78) |
Apr
(65) |
May
(118) |
Jun
(121) |
Jul
(190) |
Aug
(95) |
Sep
(160) |
Oct
(114) |
Nov
(85) |
Dec
(79) |
| 2006 |
Jan
(103) |
Feb
(89) |
Mar
(41) |
Apr
(122) |
May
(94) |
Jun
(62) |
Jul
(491) |
Aug
(95) |
Sep
(279) |
Oct
(167) |
Nov
(156) |
Dec
(624) |
| 2007 |
Jan
(364) |
Feb
(271) |
Mar
(315) |
Apr
(378) |
May
(193) |
Jun
(235) |
Jul
(548) |
Aug
(388) |
Sep
(725) |
Oct
(369) |
Nov
(322) |
Dec
(487) |
| 2008 |
Jan
(552) |
Feb
(628) |
Mar
(817) |
Apr
(746) |
May
(1224) |
Jun
(1971) |
Jul
(1191) |
Aug
(876) |
Sep
(491) |
Oct
(267) |
Nov
(354) |
Dec
(747) |
| 2009 |
Jan
(322) |
Feb
(442) |
Mar
(573) |
Apr
(303) |
May
(401) |
Jun
(340) |
Jul
(403) |
Aug
(238) |
Sep
(267) |
Oct
(347) |
Nov
(456) |
Dec
(184) |
| 2010 |
Jan
(246) |
Feb
(432) |
Mar
(598) |
Apr
(250) |
May
(498) |
Jun
(715) |
Jul
(1282) |
Aug
(350) |
Sep
(504) |
Oct
(632) |
Nov
(870) |
Dec
(170) |
| 2011 |
Jan
(206) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jay G. <jay...@us...> - 2004-12-28 18:45:00
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10427 Modified Files: RxStashAction.java Log Message: Changed method perform to execute Changed call to getResources now passed in HttpServletRequest object Index: RxStashAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxStashAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RxStashAction.java 5 Feb 2004 19:53:10 -0000 1.1 --- RxStashAction.java 28 Dec 2004 18:44:47 -0000 1.2 *************** *** 18,22 **** * This software was written for the * Department of Family Medicine ! * McMaster Unviersity * Hamilton * Ontario, Canada --- 18,22 ---- * This software was written for the * Department of Family Medicine ! * McMaster University * Hamilton * Ontario, Canada *************** *** 45,49 **** ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, --- 45,49 ---- ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, *************** *** 53,57 **** // Extract attributes we will need Locale locale = getLocale(request); ! MessageResources messages = getResources(); // Setup variables --- 53,57 ---- // Extract attributes we will need Locale locale = getLocale(request); ! MessageResources messages = getResources(request); // Setup variables |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:43:39
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10194 Modified Files: MsgHandleMessagesAction.java Log Message: Changed method perform to execute Changed call to getResources now passed in HttpServletRequest object Index: MsgHandleMessagesAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgHandleMessagesAction.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MsgHandleMessagesAction.java 9 Dec 2004 19:30:40 -0000 1.10 --- MsgHandleMessagesAction.java 28 Dec 2004 18:43:28 -0000 1.11 *************** *** 45,49 **** public class MsgHandleMessagesAction extends Action { ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, --- 45,49 ---- public class MsgHandleMessagesAction extends Action { ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, *************** *** 52,56 **** // Extract attributes we will need Locale locale = getLocale(request); ! MessageResources messages = getResources(); MsgSessionBean bean = (MsgSessionBean)request.getSession().getAttribute("msgSessionBean"); String providerNo = bean.getProviderNo(); --- 52,56 ---- // Extract attributes we will need Locale locale = getLocale(request); ! MessageResources messages = getResources(request); MsgSessionBean bean = (MsgSessionBean)request.getSession().getAttribute("msgSessionBean"); String providerNo = bean.getProviderNo(); |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:42:56
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10052 Modified Files: RxDeleteFavoriteAction.java Log Message: Changed method perform to execute Changed call to getResources now passed in HttpServletRequest object Index: RxDeleteFavoriteAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxDeleteFavoriteAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RxDeleteFavoriteAction.java 5 Feb 2004 19:53:10 -0000 1.1 --- RxDeleteFavoriteAction.java 28 Dec 2004 18:42:46 -0000 1.2 *************** *** 18,22 **** * This software was written for the * Department of Family Medicine ! * McMaster Unviersity * Hamilton * Ontario, Canada --- 18,22 ---- * This software was written for the * Department of Family Medicine ! * McMaster University * Hamilton * Ontario, Canada *************** *** 47,51 **** ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, --- 47,51 ---- ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, *************** *** 55,59 **** // Extract attributes we will need Locale locale = getLocale(request); ! MessageResources messages = getResources(); int favoriteId = Integer.parseInt(((RxDeleteFavoriteForm)form).getFavoriteId()); --- 55,59 ---- // Extract attributes we will need Locale locale = getLocale(request); ! MessageResources messages = getResources(request); int favoriteId = Integer.parseInt(((RxDeleteFavoriteForm)form).getFavoriteId()); |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:42:04
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9883 Modified Files: RxUseFavoriteAction.java Log Message: Changed method perform to execute Changed call to getResources now passed in HttpServletRequest object Index: RxUseFavoriteAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxUseFavoriteAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RxUseFavoriteAction.java 5 Feb 2004 19:53:10 -0000 1.1 --- RxUseFavoriteAction.java 28 Dec 2004 18:41:51 -0000 1.2 *************** *** 18,22 **** * This software was written for the * Department of Family Medicine ! * McMaster Unviersity * Hamilton * Ontario, Canada --- 18,22 ---- * This software was written for the * Department of Family Medicine ! * McMaster University * Hamilton * Ontario, Canada *************** *** 47,51 **** ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, --- 47,51 ---- ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, *************** *** 55,59 **** // Extract attributes we will need Locale locale = getLocale(request); ! MessageResources messages = getResources(); // Setup variables --- 55,59 ---- // Extract attributes we will need Locale locale = getLocale(request); ! MessageResources messages = getResources(request); // Setup variables |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:40:50
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9696 Modified Files: RxDrugInfoAction.java Log Message: Changed method perform to execute Changed call to getResources now passed in HttpServletRequest object Index: RxDrugInfoAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxDrugInfoAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RxDrugInfoAction.java 5 Feb 2004 19:53:10 -0000 1.1 --- RxDrugInfoAction.java 28 Dec 2004 18:40:41 -0000 1.2 *************** *** 18,22 **** * This software was written for the * Department of Family Medicine ! * McMaster Unviersity * Hamilton * Ontario, Canada --- 18,22 ---- * This software was written for the * Department of Family Medicine ! * McMaster University * Hamilton * Ontario, Canada *************** *** 47,51 **** ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, --- 47,51 ---- ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, *************** *** 55,59 **** // Extract attributes we will need Locale locale = getLocale(request); ! MessageResources messages = getResources(); --- 55,59 ---- // Extract attributes we will need Locale locale = getLocale(request); ! MessageResources messages = getResources(request); |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:39:00
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9254 Modified Files: MsgViewMessageAction.java Log Message: Changed method perform to execute Changed call to getResources now passed in HttpServletRequest object Index: MsgViewMessageAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgViewMessageAction.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MsgViewMessageAction.java 2 Jun 2004 20:54:00 -0000 1.7 --- MsgViewMessageAction.java 28 Dec 2004 18:38:48 -0000 1.8 *************** *** 18,22 **** // * This software was written for the // * Department of Family Medicine ! // * McMaster Unviersity // * Hamilton // * Ontario, Canada --- 18,22 ---- // * This software was written for the // * Department of Family Medicine ! // * McMaster University // * Hamilton // * Ontario, Canada *************** *** 45,49 **** public class MsgViewMessageAction extends Action { ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, --- 45,49 ---- public class MsgViewMessageAction extends Action { ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, *************** *** 53,57 **** // Extract attributes we will need Locale locale = getLocale(request); ! MessageResources messages = getResources(); oscar.oscarMessenger.pageUtil.MsgSessionBean bean = (oscar.oscarMessenger.pageUtil.MsgSessionBean)request.getSession().getAttribute("msgSessionBean"); --- 53,57 ---- // Extract attributes we will need Locale locale = getLocale(request); ! MessageResources messages = getResources(request); oscar.oscarMessenger.pageUtil.MsgSessionBean bean = (oscar.oscarMessenger.pageUtil.MsgSessionBean)request.getSession().getAttribute("msgSessionBean"); |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:38:12
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9095 Modified Files: RxAddAllergyAction.java Log Message: Changed method perform to execute Changed call to getResources now passed in HttpServletRequest object Index: RxAddAllergyAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxAddAllergyAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RxAddAllergyAction.java 5 Feb 2004 19:53:10 -0000 1.1 --- RxAddAllergyAction.java 28 Dec 2004 18:38:00 -0000 1.2 *************** *** 18,22 **** * This software was written for the * Department of Family Medicine ! * McMaster Unviersity * Hamilton * Ontario, Canada --- 18,22 ---- * This software was written for the * Department of Family Medicine ! * McMaster University * Hamilton * Ontario, Canada *************** *** 47,51 **** public final class RxAddAllergyAction extends Action { ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, --- 47,51 ---- public final class RxAddAllergyAction extends Action { ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, *************** *** 55,59 **** // Extract attributes we will need Locale locale = getLocale(request); ! MessageResources messages = getResources(); // Setup variables --- 55,59 ---- // Extract attributes we will need Locale locale = getLocale(request); ! MessageResources messages = getResources(request); // Setup variables |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:33:39
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8390 Modified Files: EctConsultationFormRequestForm.java Log Message: changed method call from empty() to isEmpty() Index: EctConsultationFormRequestForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestForm.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EctConsultationFormRequestForm.java 9 Aug 2004 20:23:42 -0000 1.4 --- EctConsultationFormRequestForm.java 28 Dec 2004 18:33:29 -0000 1.5 *************** *** 3,24 **** // * // * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! // * This software is published under the GPL GNU General Public License. ! // * This program is free software; you can redistribute it and/or ! // * modify it under the terms of the GNU General Public License ! // * as published by the Free Software Foundation; either version 2 ! // * of the License, or (at your option) any later version. * ! // * This program is distributed in the hope that it will be useful, ! // * but WITHOUT ANY WARRANTY; without even the implied warranty of ! // * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! // * along with this program; if not, write to the Free Software ! // * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! // * // * <OSCAR TEAM> ! // * This software was written for the ! // * Department of Family Medicine ! // * McMaster Unviersity ! // * Hamilton ! // * Ontario, Canada // * // ----------------------------------------------------------------------------------------------------------------------- --- 3,24 ---- // * // * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! // * This software is published under the GPL GNU General Public License. ! // * This program is free software; you can redistribute it and/or ! // * modify it under the terms of the GNU General Public License ! // * as published by the Free Software Foundation; either version 2 ! // * of the License, or (at your option) any later version. * ! // * This program is distributed in the hope that it will be useful, ! // * but WITHOUT ANY WARRANTY; without even the implied warranty of ! // * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! // * along with this program; if not, write to the Free Software ! // * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! // * // * <OSCAR TEAM> ! // * This software was written for the ! // * Department of Family Medicine ! // * McMaster University ! // * Hamilton ! // * Ontario, Canada // * // ----------------------------------------------------------------------------------------------------------------------- *************** *** 31,374 **** public final class EctConsultationFormRequestForm extends ActionForm { ! ! public String getProviderNo() ! { ! if(providerNo == null) ! providerNo = new String(); ! return providerNo; ! } ! ! public void setProviderNo(String str) ! { ! System.out.println("providerNo date has been set"); ! providerNo = str; ! } ! ! public String getDemographicNo() ! { ! if(demographicNo == null) ! demographicNo = new String(); ! return demographicNo; ! } ! ! public void setDemographicNo(String str) ! { ! System.out.println("demographicNo date has been set"); ! demographicNo = str; ! } ! ! public String getRequestId() ! { ! if(requestId == null) ! requestId = new String(); ! return requestId; ! } ! ! public void setRequestId(String str) ! { ! System.out.println("requestId date has been set"); ! requestId = str; ! } ! ! public String getReferalDate() ! { ! if(referalDate == null) ! referalDate = new String(); ! return referalDate; ! } ! ! public void setReferalDate(String str) ! { ! System.out.println("referal date has been set"); ! referalDate = str; ! } ! ! public String getService() ! { ! if(service == null) ! service = new String(); ! return service; ! } ! ! public void setService(String str) ! { ! System.out.println("service has been set"); ! service = str; ! } ! ! public String getSpecialist() ! { ! if(specialist == null) ! specialist = new String(); ! return specialist; ! } ! ! public void setSpecialist(String str) ! { ! System.out.println("specialist setter"); ! specialist = str; ! } ! ! public String getAppointmentYear() ! { ! if(appointmentYear == null) ! appointmentYear = new String(); ! return appointmentYear; ! } ! ! public void setAppointmentYear(String str) ! { ! System.out.println("appointmentYear setter"); ! appointmentYear = str; ! } ! ! public String getAppointmentMonth() ! { ! if(appointmentMonth == null) ! appointmentMonth = new String(); ! return appointmentMonth; ! } ! ! public void setAppointmentMonth(String str) ! { ! System.out.println("appointmentMonth setter"); ! appointmentMonth = str; ! } ! ! public String getAppointmentDay() ! { ! if(appointmentDay == null) ! appointmentDay = new String(); ! return appointmentDay; ! } ! ! public void setAppointmentDay(String str) ! { ! System.out.println("appointmentDay setter"); ! appointmentDay = str; ! } ! ! public String getAppointmentTime() ! { ! if(appointmentTime == null) ! appointmentTime = new String(); ! return appointmentTime; ! } ! ! public void setAppointmentTime(String str) ! { ! System.out.println("appointmentTime setter"); ! appointmentTime = str; ! } ! ! public String getReasonForConsultation() ! { ! if(reasonForConsultation == null) ! reasonForConsultation = new String(); ! return reasonForConsultation; ! } ! ! public void setReasonForConsultation(String str) ! { ! System.out.println("reasonForConsultation setter"); ! reasonForConsultation = str; ! } ! ! public String getClinicalInformation() ! { ! if(clinicalInformation == null) ! clinicalInformation = new String(); ! return clinicalInformation; ! } ! ! public void setClinicalInformation(String str) ! { ! System.out.println("clinicalInformation setter"); ! clinicalInformation = str; ! } ! ! public String getConcurrentProblems() ! { ! if(concurrentProblems == null) ! concurrentProblems = new String(); ! return concurrentProblems; ! } ! ! public void setConcurrentProblems(String str) ! { ! System.out.println("concurrentProblems setter"); ! concurrentProblems = str; ! } ! ! public String getCurrentMedications() ! { ! if(currentMedications == null) ! currentMedications = new String(); ! return currentMedications; ! } ! ! public void setCurrentMedications(String str) ! { ! System.out.println("currentMedications setter"); ! currentMedications = str; ! } ! ! public String getAllergies() ! { ! if(allergies == null) ! allergies = new String(); ! return allergies; ! } ! ! public void setAllergies(String str) ! { ! System.out.println("allergies setter = ".concat(String.valueOf(String.valueOf(str)))); ! allergies = str; ! } ! ! public String getSendTo() ! { ! if(sendTo == null) ! sendTo = new String(); ! return sendTo; ! } ! ! public void setSendTo(String str) ! { ! System.out.println("sendTo setter"); ! sendTo = str; ! } ! ! public String getStatus() ! { ! if(status == null) ! status = new String(); ! return status; ! } ! ! public void setStatus(String str) ! { ! status = str; ! } ! ! public String getSubmission() ! { ! if(submission == null) ! submission = new String(); ! return submission; ! } ! ! public void setSubmission(String str) ! { ! submission = str; ! } ! ! public String getAppointmentHour() ! { ! if(appointmentHour == null) ! appointmentHour = new String(); ! return appointmentHour; ! } ! ! public void setAppointmentHour(String str) ! { ! appointmentHour = str; ! } ! ! public String getAppointmentMinute() ! { ! if(appointmentMinute == null) ! appointmentMinute = new String(); ! return appointmentMinute; ! } ! ! public void setAppointmentMinute(String str) ! { ! appointmentMinute = str; ! } ! ! public String getAppointmentPm() ! { ! if(appointmentPm == null) ! appointmentPm = new String(); ! return appointmentPm; ! } ! ! public void setAppointmentPm(String str) ! { ! appointmentPm = str; ! } ! ! public String getAppointmentNotes() ! { ! if(appointmentNotes == null) ! appointmentNotes = new String(); ! return appointmentNotes; ! } ! ! public void setAppointmentNotes(String str) ! { ! appointmentNotes = str; ! } ! ! public String getUrgency() ! { ! if(urgency == null) ! urgency = new String(); ! return urgency; ! } ! ! public void setUrgency(String str) ! { ! urgency = str; ! } ! ! public void reset(ActionMapping mapping, HttpServletRequest request) ! { ! System.out.println("\nReseting ConsultationFormRequestForm\n"); ! } ! ! public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) ! { ! ActionErrors errors = new ActionErrors(); ! if(service == null || service.length() == 0) ! errors.add("service", new ActionError("Errors.service.null")); ! try ! { ! int temp = Integer.parseInt(service); ! if(temp < 0) ! errors.add("service", new ActionError("Errors.service.noServiceSelected")); ! } ! catch(Exception e) ! { ! errors.add("fName", new ActionError("Errors.service.notNum")); ! } ! if(!errors.empty()) ! request.setAttribute("validateError", "blah"); ! return errors; ! } ! ! String providerNo; ! String demographicNo; ! String requestId; ! String referalDate; ! String service; ! String specialist; ! String appointmentYear; ! String appointmentMonth; ! String appointmentDay; ! String appointmentTime; ! String reasonForConsultation; ! String clinicalInformation; ! String concurrentProblems; ! String currentMedications; ! String allergies; ! String sendTo; ! String status; ! String submission; ! String appointmentHour; ! String appointmentMinute; ! String appointmentPm; ! String appointmentNotes; ! String urgency; } --- 31,324 ---- public final class EctConsultationFormRequestForm extends ActionForm { ! ! public String getProviderNo() { ! if(providerNo == null) ! providerNo = new String(); ! return providerNo; ! } ! ! public void setProviderNo(String str) { ! System.out.println("providerNo date has been set"); ! providerNo = str; ! } ! ! public String getDemographicNo() { ! if(demographicNo == null) ! demographicNo = new String(); ! return demographicNo; ! } ! ! public void setDemographicNo(String str) { ! System.out.println("demographicNo date has been set"); ! demographicNo = str; ! } ! ! public String getRequestId() { ! if(requestId == null) ! requestId = new String(); ! return requestId; ! } ! ! public void setRequestId(String str) { ! System.out.println("requestId date has been set"); ! requestId = str; ! } ! ! public String getReferalDate() { ! if(referalDate == null) ! referalDate = new String(); ! return referalDate; ! } ! ! public void setReferalDate(String str) { ! System.out.println("referal date has been set"); ! referalDate = str; ! } ! ! public String getService() { ! if(service == null) ! service = new String(); ! return service; ! } ! ! public void setService(String str) { ! System.out.println("service has been set"); ! service = str; ! } ! ! public String getSpecialist() { ! if(specialist == null) ! specialist = new String(); ! return specialist; ! } ! ! public void setSpecialist(String str) { ! System.out.println("specialist setter"); ! specialist = str; ! } ! ! public String getAppointmentYear() { ! if(appointmentYear == null) ! appointmentYear = new String(); ! return appointmentYear; ! } ! ! public void setAppointmentYear(String str) { ! System.out.println("appointmentYear setter"); ! appointmentYear = str; ! } ! ! public String getAppointmentMonth() { ! if(appointmentMonth == null) ! appointmentMonth = new String(); ! return appointmentMonth; ! } ! ! public void setAppointmentMonth(String str) { ! System.out.println("appointmentMonth setter"); ! appointmentMonth = str; ! } ! ! public String getAppointmentDay() { ! if(appointmentDay == null) ! appointmentDay = new String(); ! return appointmentDay; ! } ! ! public void setAppointmentDay(String str) { ! System.out.println("appointmentDay setter"); ! appointmentDay = str; ! } ! ! public String getAppointmentTime() { ! if(appointmentTime == null) ! appointmentTime = new String(); ! return appointmentTime; ! } ! ! public void setAppointmentTime(String str) { ! System.out.println("appointmentTime setter"); ! appointmentTime = str; ! } ! ! public String getReasonForConsultation() { ! if(reasonForConsultation == null) ! reasonForConsultation = new String(); ! return reasonForConsultation; ! } ! ! public void setReasonForConsultation(String str) { ! System.out.println("reasonForConsultation setter"); ! reasonForConsultation = str; ! } ! ! public String getClinicalInformation() { ! if(clinicalInformation == null) ! clinicalInformation = new String(); ! return clinicalInformation; ! } ! ! public void setClinicalInformation(String str) { ! System.out.println("clinicalInformation setter"); ! clinicalInformation = str; ! } ! ! public String getConcurrentProblems() { ! if(concurrentProblems == null) ! concurrentProblems = new String(); ! return concurrentProblems; ! } ! ! public void setConcurrentProblems(String str) { ! System.out.println("concurrentProblems setter"); ! concurrentProblems = str; ! } ! ! public String getCurrentMedications() { ! if(currentMedications == null) ! currentMedications = new String(); ! return currentMedications; ! } ! ! public void setCurrentMedications(String str) { ! System.out.println("currentMedications setter"); ! currentMedications = str; ! } ! ! public String getAllergies() { ! if(allergies == null) ! allergies = new String(); ! return allergies; ! } ! ! public void setAllergies(String str) { ! System.out.println("allergies setter = ".concat(String.valueOf(String.valueOf(str)))); ! allergies = str; ! } ! ! public String getSendTo() { ! if(sendTo == null) ! sendTo = new String(); ! return sendTo; ! } ! ! public void setSendTo(String str) { ! System.out.println("sendTo setter"); ! sendTo = str; ! } ! ! public String getStatus() { ! if(status == null) ! status = new String(); ! return status; ! } ! ! public void setStatus(String str) { ! status = str; ! } ! ! public String getSubmission() { ! if(submission == null) ! submission = new String(); ! return submission; ! } ! ! public void setSubmission(String str) { ! submission = str; ! } ! ! public String getAppointmentHour() { ! if(appointmentHour == null) ! appointmentHour = new String(); ! return appointmentHour; ! } ! ! public void setAppointmentHour(String str) { ! appointmentHour = str; ! } ! ! public String getAppointmentMinute() { ! if(appointmentMinute == null) ! appointmentMinute = new String(); ! return appointmentMinute; ! } ! ! public void setAppointmentMinute(String str) { ! appointmentMinute = str; ! } ! ! public String getAppointmentPm() { ! if(appointmentPm == null) ! appointmentPm = new String(); ! return appointmentPm; ! } ! ! public void setAppointmentPm(String str) { ! appointmentPm = str; ! } ! ! public String getAppointmentNotes() { ! if(appointmentNotes == null) ! appointmentNotes = new String(); ! return appointmentNotes; ! } ! ! public void setAppointmentNotes(String str) { ! appointmentNotes = str; ! } ! ! public String getUrgency() { ! if(urgency == null) ! urgency = new String(); ! return urgency; ! } ! ! public void setUrgency(String str) { ! urgency = str; ! } ! ! public void reset(ActionMapping mapping, HttpServletRequest request) { ! System.out.println("\nReseting ConsultationFormRequestForm\n"); ! } ! ! public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) { ! ActionErrors errors = new ActionErrors(); ! if(service == null || service.length() == 0) ! errors.add("service", new ActionError("Errors.service.null")); ! try { ! int temp = Integer.parseInt(service); ! if(temp < 0) ! errors.add("service", new ActionError("Errors.service.noServiceSelected")); ! } ! catch(Exception e) { ! errors.add("fName", new ActionError("Errors.service.notNum")); ! } ! if(!errors.isEmpty()) ! request.setAttribute("validateError", "blah"); ! return errors; ! } ! ! String providerNo; ! String demographicNo; ! String requestId; ! String referalDate; ! String service; ! String specialist; ! String appointmentYear; ! String appointmentMonth; ! String appointmentDay; ! String appointmentTime; ! String reasonForConsultation; ! String clinicalInformation; ! String concurrentProblems; ! String currentMedications; ! String allergies; ! String sendTo; ! String status; ! String submission; ! String appointmentHour; ! String appointmentMinute; ! String appointmentPm; ! String appointmentNotes; ! String urgency; } |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:31:24
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7935 Modified Files: EctConAddSpecialistForm.java Log Message: changed method call from empty() to isEmpty() 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.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EctConAddSpecialistForm.java 26 Apr 2004 18:52:17 -0000 1.5 --- EctConAddSpecialistForm.java 28 Dec 2004 18:31:08 -0000 1.6 *************** *** 3,24 **** // * // * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! // * This software is published under the GPL GNU General Public License. ! // * This program is free software; you can redistribute it and/or ! // * modify it under the terms of the GNU General Public License ! // * as published by the Free Software Foundation; either version 2 ! // * of the License, or (at your option) any later version. * ! // * This program is distributed in the hope that it will be useful, ! // * but WITHOUT ANY WARRANTY; without even the implied warranty of ! // * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! // * along with this program; if not, write to the Free Software ! // * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! // * // * <OSCAR TEAM> ! // * This software was written for the ! // * Department of Family Medicine ! // * McMaster Unviersity ! // * Hamilton ! // * Ontario, Canada // * // ----------------------------------------------------------------------------------------------------------------------- --- 3,24 ---- // * // * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! // * This software is published under the GPL GNU General Public License. ! // * This program is free software; you can redistribute it and/or ! // * modify it under the terms of the GNU General Public License ! // * as published by the Free Software Foundation; either version 2 ! // * of the License, or (at your option) any later version. * ! // * This program is distributed in the hope that it will be useful, ! // * but WITHOUT ANY WARRANTY; without even the implied warranty of ! // * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! // * along with this program; if not, write to the Free Software ! // * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! // * // * <OSCAR TEAM> ! // * This software was written for the ! // * Department of Family Medicine ! // * McMaster University ! // * Hamilton ! // * Ontario, Canada // * // ----------------------------------------------------------------------------------------------------------------------- *************** *** 31,242 **** import java.util.ResourceBundle; ! public final class EctConAddSpecialistForm extends ActionForm ! { ! String fName; ! String lName; ! String proLetters; ! String address; ! String phone; ! String fax; ! String website; ! String email; ! String specType; ! String transType; ! String specId; ! int whichType; ! ! public EctConAddSpecialistForm() ! { ! whichType = 0; ! } ! ! public int getwhichType() ! { ! return whichType; ! } ! ! public String getTransType() ! { ! if(transType == null) ! transType = new String(); ! return transType; ! } ! ! public void setTransType(String str) ! { ! System.out.println("setter transtype = ".concat(String.valueOf(String.valueOf(str)))); ! transType = str; ! } ! ! public String getFirstName() ! { ! if(fName == null) ! fName = new String(); ! return fName; ! } ! ! public void setFirstName(String str) ! { ! fName = str; ! } ! ! public String getLastName() ! { ! if(lName == null) ! lName = new String(); ! return lName; ! } ! ! public void setLastName(String str) ! { ! System.out.println("setter Last Name"); ! lName = str; ! } ! ! public String getProLetters() ! { ! if(proLetters == null) ! proLetters = new String(); ! return proLetters; ! } ! ! public void setProLetters(String str) ! { ! proLetters = str; ! } ! ! public String getAddress() ! { ! if(address == null) ! address = new String(); ! return address; ! } ! ! public void setAddress(String str) ! { ! address = str; ! } ! ! public String getPhone() ! { ! if(phone == null) ! phone = new String(); ! return phone; ! } ! ! public void setPhone(String str) ! { ! phone = str; ! } ! ! public String getFax() ! { ! if(fax == null) ! fax = new String(); ! return fax; ! } ! ! public void setFax(String str) ! { ! fax = str; ! } ! ! public String getWebsite() ! { ! if(website == null) ! website = new String(); ! return website; ! } ! ! public void setWebsite(String str) ! { ! website = str; ! } ! ! public String getEmail() ! { ! if(email == null) ! email = new String(); ! return email; ! } ! ! public void setEmail(String str) ! { ! email = str; ! } ! ! public String getSpecType() ! { ! if(specType == null) ! specType = new String(); ! return specType; ! } ! ! public void setSpecType(String str) ! { ! specType = str; ! } ! ! public String getSpecId() ! { ! if(specId == null) ! specId = new String(); ! return specId; ! } ! ! public void setSpecId(String str) ! { ! specId = str; ! } ! ! public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) ! { ! System.out.println("Validating Add Spec Form"); ! ActionErrors errors = new ActionErrors(); ! if(fName == null || fName.length() == 0) ! errors.add("fName", new ActionError("Errors.Firstname")); ! if(lName == null || lName.length() == 0) ! errors.add("lName", new ActionError("Errors.Lastname")); ! if(phone == null || phone.length() == 0) ! errors.add("phone", new ActionError("Errors.Phone")); ! if(address == null || address.length() == 0) ! errors.add("address", new ActionError("Errors.Address")); ! if(!errors.empty() && whichType == 2) ! request.setAttribute("upd", "getterUpdating"); ! return errors; ! } ! ! public void reset(ActionMapping mapping, HttpServletRequest request) ! { ! System.out.println("RESETING FORM"); ! fName = null; ! lName = null; ! proLetters = null; ! address = null; ! phone = null; ! fax = null; ! website = null; ! email = null; ! specType = null; ! transType = null; ! specId = null; ! whichType = 0; ! } ! ! /** ! * Returns the whichType. ! * @return int ! */ ! public int getWhichType() { ! return whichType; ! } ! ! /** ! * Sets the whichType. ! * @param whichType The whichType to set ! */ ! public void setWhichType(int whichType) { ! this.whichType = whichType; ! } ! } --- 31,215 ---- import java.util.ResourceBundle; ! public final class EctConAddSpecialistForm extends ActionForm { ! String fName; ! String lName; ! String proLetters; ! String address; ! String phone; ! String fax; ! String website; ! String email; ! String specType; ! String transType; ! String specId; ! int whichType; ! ! public EctConAddSpecialistForm() { ! whichType = 0; ! } ! ! public int getwhichType() { ! return whichType; ! } ! ! public String getTransType() { ! if(transType == null) ! transType = new String(); ! return transType; ! } ! ! public void setTransType(String str) { ! System.out.println("setter transtype = ".concat(String.valueOf(String.valueOf(str)))); ! transType = str; ! } ! ! public String getFirstName() { ! if(fName == null) ! fName = new String(); ! return fName; ! } ! ! public void setFirstName(String str) { ! fName = str; ! } ! ! public String getLastName() { ! if(lName == null) ! lName = new String(); ! return lName; ! } ! ! public void setLastName(String str) { ! System.out.println("setter Last Name"); ! lName = str; ! } ! ! public String getProLetters() { ! if(proLetters == null) ! proLetters = new String(); ! return proLetters; ! } ! ! public void setProLetters(String str) { ! proLetters = str; ! } ! ! public String getAddress() { ! if(address == null) ! address = new String(); ! return address; ! } ! ! public void setAddress(String str) { ! address = str; ! } ! ! public String getPhone() { ! if(phone == null) ! phone = new String(); ! return phone; ! } ! ! public void setPhone(String str) { ! phone = str; ! } ! ! public String getFax() { ! if(fax == null) ! fax = new String(); ! return fax; ! } ! ! public void setFax(String str) { ! fax = str; ! } ! ! public String getWebsite() { ! if(website == null) ! website = new String(); ! return website; ! } ! ! public void setWebsite(String str) { ! website = str; ! } ! ! public String getEmail() { ! if(email == null) ! email = new String(); ! return email; ! } ! ! public void setEmail(String str) { ! email = str; ! } ! ! public String getSpecType() { ! if(specType == null) ! specType = new String(); ! return specType; ! } ! ! public void setSpecType(String str) { ! specType = str; ! } ! ! public String getSpecId() { ! if(specId == null) ! specId = new String(); ! return specId; ! } ! ! public void setSpecId(String str) { ! specId = str; ! } ! ! public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) { ! System.out.println("Validating Add Spec Form"); ! ActionErrors errors = new ActionErrors(); ! if(fName == null || fName.length() == 0) ! errors.add("fName", new ActionError("Errors.Firstname")); ! if(lName == null || lName.length() == 0) ! errors.add("lName", new ActionError("Errors.Lastname")); ! if(phone == null || phone.length() == 0) ! errors.add("phone", new ActionError("Errors.Phone")); ! if(address == null || address.length() == 0) ! errors.add("address", new ActionError("Errors.Address")); ! if(!errors.isEmpty() && whichType == 2) ! request.setAttribute("upd", "getterUpdating"); ! return errors; ! } ! ! public void reset(ActionMapping mapping, HttpServletRequest request) { ! System.out.println("RESETING FORM"); ! fName = null; ! lName = null; ! proLetters = null; ! address = null; ! phone = null; ! fax = null; ! website = null; ! email = null; ! specType = null; ! transType = null; ! specId = null; ! whichType = 0; ! } ! ! /** ! * Returns the whichType. ! * @return int ! */ ! public int getWhichType() { ! return whichType; ! } ! ! /** ! * Sets the whichType. ! * @param whichType The whichType to set ! */ ! public void setWhichType(int whichType) { ! this.whichType = whichType; ! } ! } |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:30:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7741 Modified Files: EctImmCreateImmunizationSetInitForm.java Log Message: changed method call from empty() to isEmpty() Index: EctImmCreateImmunizationSetInitForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/pageUtil/EctImmCreateImmunizationSetInitForm.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EctImmCreateImmunizationSetInitForm.java 21 Jul 2004 14:58:59 -0000 1.5 --- EctImmCreateImmunizationSetInitForm.java 28 Dec 2004 18:30:07 -0000 1.6 *************** *** 1,24 **** /* ! * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! * * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster Unviersity ! * Hamilton ! * Ontario, Canada */ package oscar.oscarEncounter.immunization.config.pageUtil; --- 1,24 ---- /* ! * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! * * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster University ! * Hamilton ! * Ontario, Canada */ package oscar.oscarEncounter.immunization.config.pageUtil; *************** *** 27,106 **** import org.apache.struts.action.*; ! public final class EctImmCreateImmunizationSetInitForm extends ActionForm ! { ! ! public String getSetName() ! { ! if(setName == null) ! setName = new String(); ! return setName; ! } ! ! public void setSetName(String str) ! { ! setName = str; ! } ! ! public String getNumRows() ! { ! if(numRows == null) ! numRows = new String(); ! return numRows; ! } ! ! public void setNumRows(String str) ! { ! numRows = str; ! } ! ! public String getNumCols() ! { ! if(numCols == null) ! numCols = new String(); ! return numCols; ! } ! ! public void setNumCols(String str) ! { ! numCols = str; ! } ! ! public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) ! { ! ActionErrors errors = new ActionErrors(); ! if(setName == null || setName.length() == 0) ! errors.add("setName", new ActionError("Error.setName.missing")); ! if(numRows == null || numRows.length() == 0) ! errors.add("numRows", new ActionError("Error.numRows.missing")); ! if(numCols == null || numCols.length() == 0) ! errors.add("numCols", new ActionError("Error.numCols.missing")); ! if(errors.empty()) ! { ! try ! { ! int cols = Integer.parseInt(numCols); ! if(cols <= 0) ! errors.add("numCols2", new ActionError("Error.numCols.below.zero")); ! } ! catch(Exception e) ! { ! errors.add("numCols3", new ActionError("Error.numCols.non.numeric")); ! } ! try ! { ! int rows = Integer.parseInt(numRows); ! if(rows <= 0) ! errors.add("numRows2", new ActionError("Error.numRows.below.zero")); ! } ! catch(Exception e) ! { ! errors.add("numRows3", new ActionError("Error.numRows.non.numeric")); ! } ! } ! return errors; ! } ! ! String setName; ! String numRows; ! String numCols; } --- 27,93 ---- import org.apache.struts.action.*; ! public final class EctImmCreateImmunizationSetInitForm extends ActionForm { ! ! public String getSetName() { ! if(setName == null) ! setName = new String(); ! return setName; ! } ! ! public void setSetName(String str) { ! setName = str; ! } ! ! public String getNumRows() { ! if(numRows == null) ! numRows = new String(); ! return numRows; ! } ! ! public void setNumRows(String str) { ! numRows = str; ! } ! ! public String getNumCols() { ! if(numCols == null) ! numCols = new String(); ! return numCols; ! } ! ! public void setNumCols(String str) { ! numCols = str; ! } ! ! public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) { ! ActionErrors errors = new ActionErrors(); ! if(setName == null || setName.length() == 0) ! errors.add("setName", new ActionError("Error.setName.missing")); ! if(numRows == null || numRows.length() == 0) ! errors.add("numRows", new ActionError("Error.numRows.missing")); ! if(numCols == null || numCols.length() == 0) ! errors.add("numCols", new ActionError("Error.numCols.missing")); ! if(errors.isEmpty()) { ! try { ! int cols = Integer.parseInt(numCols); ! if(cols <= 0) ! errors.add("numCols2", new ActionError("Error.numCols.below.zero")); ! } ! catch(Exception e) { ! errors.add("numCols3", new ActionError("Error.numCols.non.numeric")); ! } ! try { ! int rows = Integer.parseInt(numRows); ! if(rows <= 0) ! errors.add("numRows2", new ActionError("Error.numRows.below.zero")); ! } ! catch(Exception e) { ! errors.add("numRows3", new ActionError("Error.numRows.non.numeric")); ! } ! } ! return errors; ! } ! ! String setName; ! String numRows; ! String numCols; } |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:27:30
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/login In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7179 Modified Files: LoginAction.java Log Message: Changed method perform to execute Index: LoginAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/login/LoginAction.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** LoginAction.java 20 Jul 2004 17:13:29 -0000 1.12 --- LoginAction.java 28 Dec 2004 18:27:20 -0000 1.13 *************** *** 18,22 **** * This software was written for the * Department of Family Medicine ! * McMaster Unviersity * Hamilton * Ontario, Canada --- 18,22 ---- * This software was written for the * Department of Family Medicine ! * McMaster University * Hamilton * Ontario, Canada *************** *** 39,44 **** public final class LoginAction extends Action { ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException { String ip = request.getRemoteAddr(); String where = "failure"; --- 39,44 ---- public final class LoginAction extends Action { ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException { String ip = request.getRemoteAddr(); String where = "failure"; |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:25:24
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6686 Modified Files: appointmentprovideradminday.jsp Log Message: Changed session Global variable to "org.apache.struts.Globals.LOCALE_KEY" Index: appointmentprovideradminday.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** appointmentprovideradminday.jsp 15 Oct 2004 02:46:53 -0000 1.37 --- appointmentprovideradminday.jsp 28 Dec 2004 18:25:12 -0000 1.38 *************** *** 279,283 **** } ! java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.action.Action.LOCALE_KEY); %> <table BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%"> --- 279,283 ---- } ! java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY); %> <table BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%"> *************** *** 301,305 **** <% ! //java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.action.Action.LOCALE_KEY); if (vLocale.getCountry().equals("BR")) { %> <a HREF="#" ONCLICK ="popupPage2('../oscar/billing/consultaFaturamentoMedico/init.do');return false;" TITLE='<bean:message key="global.genBillReport"/>' onmouseover="window.status='<bean:message key="global.genBillReport"/>';return true"><bean:message key="global.billing"/></a></font></td> --- 301,305 ---- <% ! //java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY); if (vLocale.getCountry().equals("BR")) { %> <a HREF="#" ONCLICK ="popupPage2('../oscar/billing/consultaFaturamentoMedico/init.do');return false;" TITLE='<bean:message key="global.genBillReport"/>' onmouseover="window.status='<bean:message key="global.genBillReport"/>';return true"><bean:message key="global.billing"/></a></font></td> *************** *** 615,619 **** <%= bShortcutForm2?"<a href=# onClick='popupPage2( \"../form/forwardshortcutname.jsp?formname="+formName2+"&demographic_no="+demographic_no+"\")' title='form'>|"+formName2Short+"</a>" : ""%> <% if(status.indexOf('B')==-1) { ! //java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.action.Action.LOCALE_KEY); if (vLocale.getCountry().equals("BR")) { %> <a href=# onClick='popupPage(700,1000, "../oscar/billing/procedimentoRealizado/init.do?appId=<%=rs.getString("appointment_no")%>");return false;' title="Faturamento">|FAT|</a> --- 615,619 ---- <%= bShortcutForm2?"<a href=# onClick='popupPage2( \"../form/forwardshortcutname.jsp?formname="+formName2+"&demographic_no="+demographic_no+"\")' title='form'>|"+formName2Short+"</a>" : ""%> <% if(status.indexOf('B')==-1) { ! //java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY); if (vLocale.getCountry().equals("BR")) { %> <a href=# onClick='popupPage(700,1000, "../oscar/billing/procedimentoRealizado/init.do?appId=<%=rs.getString("appointment_no")%>");return false;' title="Faturamento">|FAT|</a> |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:22:59
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6184 Modified Files: EctConDeleteServicesAction.java Log Message: Changed method perform to execute Index: EctConDeleteServicesAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConDeleteServicesAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EctConDeleteServicesAction.java 11 Sep 2003 20:53:39 -0000 1.3 --- EctConDeleteServicesAction.java 28 Dec 2004 18:22:47 -0000 1.4 *************** *** 3,24 **** // * // * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! // * This software is published under the GPL GNU General Public License. ! // * This program is free software; you can redistribute it and/or ! // * modify it under the terms of the GNU General Public License ! // * as published by the Free Software Foundation; either version 2 ! // * of the License, or (at your option) any later version. * ! // * This program is distributed in the hope that it will be useful, ! // * but WITHOUT ANY WARRANTY; without even the implied warranty of ! // * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! // * along with this program; if not, write to the Free Software ! // * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! // * // * <OSCAR TEAM> ! // * This software was written for the ! // * Department of Family Medicine ! // * McMaster Unviersity ! // * Hamilton ! // * Ontario, Canada // * // ----------------------------------------------------------------------------------------------------------------------- --- 3,24 ---- // * // * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! // * This software is published under the GPL GNU General Public License. ! // * This program is free software; you can redistribute it and/or ! // * modify it under the terms of the GNU General Public License ! // * as published by the Free Software Foundation; either version 2 ! // * of the License, or (at your option) any later version. * ! // * This program is distributed in the hope that it will be useful, ! // * but WITHOUT ANY WARRANTY; without even the implied warranty of ! // * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! // * along with this program; if not, write to the Free Software ! // * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! // * // * <OSCAR TEAM> ! // * This software was written for the ! // * Department of Family Medicine ! // * McMaster Unviersity ! // * Hamilton ! // * Ontario, Canada // * // ----------------------------------------------------------------------------------------------------------------------- *************** *** 34,69 **** import oscar.oscarDB.DBHandler; ! public class EctConDeleteServicesAction extends Action ! { ! ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException ! { ! System.out.println("Delete Services Action Jackson"); ! EctConDeleteServicesForm frm = (EctConDeleteServicesForm)form; ! String servs[] = frm.getService(); ! if(servs.length > 0) ! { ! StringBuffer stringBuffer = new StringBuffer(); ! for(int i = 0; i < servs.length; i++) ! if(i == servs.length - 1) ! stringBuffer.append(String.valueOf(String.valueOf((new StringBuffer(" serviceId = '")).append(servs[i]).append("' ")))); ! else ! stringBuffer.append(String.valueOf(String.valueOf((new StringBuffer(" serviceId = '")).append(servs[i]).append("' or ")))); ! ! try ! { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql = "update consultationServices set active = '02' where ".concat(String.valueOf(String.valueOf(stringBuffer.toString()))); ! System.out.println("sql = ".concat(String.valueOf(String.valueOf(sql)))); ! db.RunSQL(sql); ! db.CloseConn(); ! } ! catch(SQLException e) ! { ! System.out.println(e.getMessage()); ! } ! } ! return mapping.findForward("success"); ! } } --- 34,64 ---- import oscar.oscarDB.DBHandler; ! public class EctConDeleteServicesAction extends Action { ! ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException { ! System.out.println("Delete Services Action Jackson"); ! EctConDeleteServicesForm frm = (EctConDeleteServicesForm)form; ! String servs[] = frm.getService(); ! if(servs.length > 0) { ! StringBuffer stringBuffer = new StringBuffer(); ! for(int i = 0; i < servs.length; i++) ! if(i == servs.length - 1) ! stringBuffer.append(String.valueOf(String.valueOf((new StringBuffer(" serviceId = '")).append(servs[i]).append("' ")))); ! else ! stringBuffer.append(String.valueOf(String.valueOf((new StringBuffer(" serviceId = '")).append(servs[i]).append("' or ")))); ! ! try { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql = "update consultationServices set active = '02' where ".concat(String.valueOf(String.valueOf(stringBuffer.toString()))); ! System.out.println("sql = ".concat(String.valueOf(String.valueOf(sql)))); ! db.RunSQL(sql); ! db.CloseConn(); ! } ! catch(SQLException e) { ! System.out.println(e.getMessage()); ! } ! } ! return mapping.findForward("success"); ! } } |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:21:09
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5857 Modified Files: BillingUpdateBillingAction.java Log Message: Changed method perform to execute Index: BillingUpdateBillingAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil/BillingUpdateBillingAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BillingUpdateBillingAction.java 31 Aug 2004 20:33:46 -0000 1.1 --- BillingUpdateBillingAction.java 28 Dec 2004 18:21:00 -0000 1.2 *************** *** 1,2 **** --- 1,27 ---- + // ----------------------------------------------------------------------------------------------------------------------- + // * + // * + // * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * + // * This software is published under the GPL GNU General Public License. + // * This program is free software; you can redistribute it and/or + // * modify it under the terms of the GNU General Public License + // * as published by the Free Software Foundation; either version 2 + // * of the License, or (at your option) any later version. * + // * This program is distributed in the hope that it will be useful, + // * but WITHOUT ANY WARRANTY; without even the implied warranty of + // * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + // * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License + // * along with this program; if not, write to the Free Software + // * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + // * + // * <OSCAR TEAM> + // * This software was written for the + // * Department of Family Medicine + // * McMaster University + // * Hamilton + // * Ontario, Canada + // * + // ----------------------------------------------------------------------------------------------------------------------- + /* * BillingUpdateBillingAction.java *************** *** 20,24 **** public final class BillingUpdateBillingAction extends Action { ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, --- 45,49 ---- public final class BillingUpdateBillingAction extends Action { ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:18:11
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5343 Modified Files: SearchPatientAction.java Log Message: Changed method perform to execute Index: SearchPatientAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil/SearchPatientAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SearchPatientAction.java 26 Nov 2004 20:15:42 -0000 1.3 --- SearchPatientAction.java 28 Dec 2004 18:18:00 -0000 1.4 *************** *** 18,22 **** * This software was written for the * Department of Family Medicine ! * McMaster Unviersity * Hamilton * Ontario, Canada --- 18,22 ---- * This software was written for the * Department of Family Medicine ! * McMaster University * Hamilton * Ontario, Canada *************** *** 38,42 **** } ! public ActionForward perform(ActionMapping mapping,ActionForm form,HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException { //System.out.println("inside ReportStatusUpdateAction"); --- 38,42 ---- } ! public ActionForward execute(ActionMapping mapping,ActionForm form,HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException { //System.out.println("inside ReportStatusUpdateAction"); |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:16:31
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/config/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4924 Modified Files: MsgMessengerAdminAction.java Log Message: Changed method perform to execute Index: MsgMessengerAdminAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/config/pageUtil/MsgMessengerAdminAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MsgMessengerAdminAction.java 28 Apr 2004 17:25:26 -0000 1.5 --- MsgMessengerAdminAction.java 28 Dec 2004 18:15:56 -0000 1.6 *************** *** 18,22 **** // * This software was written for the // * Department of Family Medicine ! // * McMaster Unviersity // * Hamilton // * Ontario, Canada --- 18,22 ---- // * This software was written for the // * Department of Family Medicine ! // * McMaster University // * Hamilton // * Ontario, Canada *************** *** 49,53 **** public class MsgMessengerAdminAction extends Action { ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, --- 49,53 ---- public class MsgMessengerAdminAction extends Action { ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:14:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4513 Modified Files: EctImmSaveScheduleAction.java Log Message: Changed method perform to execute Index: EctImmSaveScheduleAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil/EctImmSaveScheduleAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EctImmSaveScheduleAction.java 26 Nov 2004 20:41:40 -0000 1.6 --- EctImmSaveScheduleAction.java 28 Dec 2004 18:13:54 -0000 1.7 *************** *** 18,22 **** // * This software was written for the // * Department of Family Medicine ! // * McMaster Unviersity // * Hamilton // * Ontario, Canada --- 18,22 ---- // * This software was written for the // * Department of Family Medicine ! // * McMaster University // * Hamilton // * Ontario, Canada *************** *** 40,44 **** public final class EctImmSaveScheduleAction extends Action { ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { if(request.getParameter("hdnAction").equalsIgnoreCase("Configure")) --- 40,44 ---- public final class EctImmSaveScheduleAction extends Action { ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { if(request.getParameter("hdnAction").equalsIgnoreCase("Configure")) |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:11:09
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4058 Modified Files: RxLinkPharmacyAction.java Log Message: Changed method perform to execute Index: RxLinkPharmacyAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxLinkPharmacyAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RxLinkPharmacyAction.java 2 Oct 2004 15:31:24 -0000 1.1 --- RxLinkPharmacyAction.java 28 Dec 2004 18:10:57 -0000 1.2 *************** *** 43,47 **** public class RxLinkPharmacyAction extends Action { ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, --- 43,47 ---- public class RxLinkPharmacyAction extends Action { ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:10:32
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3943 Modified Files: BillingCreateBillingAction.java Log Message: Changed method perform to execute Index: BillingCreateBillingAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil/BillingCreateBillingAction.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** BillingCreateBillingAction.java 30 Aug 2004 14:13:11 -0000 1.7 --- BillingCreateBillingAction.java 28 Dec 2004 18:10:12 -0000 1.8 *************** *** 18,22 **** * This software was written for the * Department of Family Medicine ! * McMaster Unviersity * Hamilton * Ontario, Canada --- 18,22 ---- * This software was written for the * Department of Family Medicine ! * McMaster University * Hamilton * Ontario, Canada *************** *** 46,50 **** ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, --- 46,50 ---- ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:08:51
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3442 Modified Files: MsgDemographicSearchAction.java Log Message: Changed method perform to execute Index: MsgDemographicSearchAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgDemographicSearchAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MsgDemographicSearchAction.java 11 Sep 2003 20:53:35 -0000 1.3 --- MsgDemographicSearchAction.java 28 Dec 2004 18:08:35 -0000 1.4 *************** *** 18,22 **** // * This software was written for the // * Department of Family Medicine ! // * McMaster Unviersity // * Hamilton // * Ontario, Canada --- 18,22 ---- // * This software was written for the // * Department of Family Medicine ! // * McMaster University // * Hamilton // * Ontario, Canada *************** *** 49,53 **** ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, --- 49,53 ---- ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:08:04
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3094 Modified Files: ObecAction.java Log Message: Changed method perform to execute Index: ObecAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/pageUtil/ObecAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ObecAction.java 21 Jul 2004 15:19:56 -0000 1.4 --- ObecAction.java 28 Dec 2004 18:07:46 -0000 1.5 *************** *** 1,24 **** /* ! * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! * * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster Unviersity ! * Hamilton ! * Ontario, Canada */ package oscar.oscarReport.pageUtil; --- 1,24 ---- /* ! * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! * * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster University ! * Hamilton ! * Ontario, Canada */ package oscar.oscarReport.pageUtil; *************** *** 41,90 **** public class ObecAction extends Action { ! ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException ! { ! Properties proppies = (Properties) request.getSession().getAttribute("oscarVariables"); ! ! ObecForm frm = (ObecForm)form; ! ObecData obecData1 = new ObecData(); ! DateUtils dateUtils = new DateUtils(); ! EctValidation validation = new EctValidation(); ! ActionErrors errors = new ActionErrors(); ! ! String startDate = frm.getXml_vdate()==null?"":frm.getXml_vdate(); ! if(!validation.isDate(startDate)){ ! System.out.println("Invalid date format!"); ! errors.add(startDate, ! new ActionError("errors.invalid", "StartDate")); ! saveErrors(request, errors); ! return (new ActionForward(mapping.getInput())); ! } ! ! int numDays = frm.getNumDays(); ! int startYear = 0; ! int startMonth = 0; ! int startDay = 0; ! ! int slashIndex1 = startDate.indexOf("-"); ! if(slashIndex1>=0){ ! startYear = Integer.parseInt(startDate.substring(0,slashIndex1)); ! int slashIndex2 = startDate.indexOf("-", slashIndex1+1); ! if (slashIndex2>slashIndex1){ ! startMonth = Integer.parseInt(startDate.substring(slashIndex1+1, slashIndex2)); ! int length = startDate.length(); ! startDay = Integer.parseInt(startDate.substring(slashIndex2+1, length)); ! } ! } ! ! ! ! String endDate = dateUtils.NextDay(startDay, startMonth, startYear, numDays); ! ! String obectxt = obecData1.generateOBEC(startDate, endDate, proppies)==null?"":obecData1.generateOBEC(startDate, endDate, proppies); ! request.setAttribute("obectxt", obectxt); ! ! return mapping.findForward("success"); ! } } --- 41,89 ---- public class ObecAction extends Action { ! ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException { ! Properties proppies = (Properties) request.getSession().getAttribute("oscarVariables"); ! ! ObecForm frm = (ObecForm)form; ! ObecData obecData1 = new ObecData(); ! DateUtils dateUtils = new DateUtils(); ! EctValidation validation = new EctValidation(); ! ActionErrors errors = new ActionErrors(); ! ! String startDate = frm.getXml_vdate()==null?"":frm.getXml_vdate(); ! if(!validation.isDate(startDate)){ ! System.out.println("Invalid date format!"); ! errors.add(startDate, ! new ActionError("errors.invalid", "StartDate")); ! saveErrors(request, errors); ! return (new ActionForward(mapping.getInput())); ! } ! ! int numDays = frm.getNumDays(); ! int startYear = 0; ! int startMonth = 0; ! int startDay = 0; ! ! int slashIndex1 = startDate.indexOf("-"); ! if(slashIndex1>=0){ ! startYear = Integer.parseInt(startDate.substring(0,slashIndex1)); ! int slashIndex2 = startDate.indexOf("-", slashIndex1+1); ! if (slashIndex2>slashIndex1){ ! startMonth = Integer.parseInt(startDate.substring(slashIndex1+1, slashIndex2)); ! int length = startDate.length(); ! startDay = Integer.parseInt(startDate.substring(slashIndex2+1, length)); ! } ! } ! ! ! ! String endDate = dateUtils.NextDay(startDay, startMonth, startYear, numDays); ! ! String obectxt = obecData1.generateOBEC(startDate, endDate, proppies)==null?"":obecData1.generateOBEC(startDate, endDate, proppies); ! request.setAttribute("obectxt", obectxt); ! ! return mapping.findForward("success"); ! } } |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:07:06
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2923 Modified Files: PatientMatchAction.java Log Message: Changed method perform to execute Index: PatientMatchAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil/PatientMatchAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PatientMatchAction.java 21 Jul 2004 15:15:30 -0000 1.2 --- PatientMatchAction.java 28 Dec 2004 18:06:52 -0000 1.3 *************** *** 1,24 **** /* ! * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! * * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster Unviersity ! * Hamilton ! * Ontario, Canada */ package oscar.oscarMDS.pageUtil; --- 1,24 ---- /* ! * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! * * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster University ! * Hamilton ! * Ontario, Canada */ package oscar.oscarMDS.pageUtil; *************** *** 33,67 **** import oscar.oscarMDS.data.MDSResultsData; ! public class PatientMatchAction extends Action ! { ! ! public PatientMatchAction() ! { ! } ! ! public ActionForward perform(ActionMapping mapping, ! ActionForm form, ! HttpServletRequest request, ! HttpServletResponse response) ! throws ServletException, IOException ! { ! ! String demographicNo = request.getParameter("demographicNo"); ! String labNo = request.getParameter("labNo"); ! ! String newURL = ""; ! ! // System.out.println("In ReportReassignAction: labNo is: "+labNo+" demographicNo is: "+demographicNo); ! ! try { ! MDSResultsData.updatePatientLabRouting(labNo, demographicNo); ! newURL = mapping.findForward("success").getPath(); ! newURL = newURL + "?demographicNo="+demographicNo; ! } catch (Exception e) { ! System.out.println("exception in ReportReassignAction:"+e); ! newURL = mapping.findForward("failure").getPath(); ! } ! // System.out.println("In ReportReassignAction: newURL is: "+newURL); ! return (new ActionForward(newURL)); ! } } \ No newline at end of file --- 33,64 ---- import oscar.oscarMDS.data.MDSResultsData; ! public class PatientMatchAction extends Action { ! ! public PatientMatchAction() { ! } ! ! public ActionForward execute(ActionMapping mapping, ! ActionForm form, ! HttpServletRequest request, ! HttpServletResponse response) ! throws ServletException, IOException { ! ! String demographicNo = request.getParameter("demographicNo"); ! String labNo = request.getParameter("labNo"); ! ! String newURL = ""; ! ! // System.out.println("In ReportReassignAction: labNo is: "+labNo+" demographicNo is: "+demographicNo); ! ! try { ! MDSResultsData.updatePatientLabRouting(labNo, demographicNo); ! newURL = mapping.findForward("success").getPath(); ! newURL = newURL + "?demographicNo="+demographicNo; ! } catch (Exception e) { ! System.out.println("exception in ReportReassignAction:"+e); ! newURL = mapping.findForward("failure").getPath(); ! } ! // System.out.println("In ReportReassignAction: newURL is: "+newURL); ! return (new ActionForward(newURL)); ! } } \ No newline at end of file |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:05:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2683 Modified Files: EctConsultationFaxAction.java Log Message: Changed method perform to execute Index: EctConsultationFaxAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFaxAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EctConsultationFaxAction.java 15 Sep 2004 19:58:02 -0000 1.5 --- EctConsultationFaxAction.java 28 Dec 2004 18:05:35 -0000 1.6 *************** *** 1,24 **** /* ! * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! * * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster Unviersity ! * Hamilton ! * Ontario, Canada */ package oscar.oscarEncounter.oscarConsultationRequest.pageUtil; --- 1,24 ---- /* ! * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! * * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster University ! * Hamilton ! * Ontario, Canada */ package oscar.oscarEncounter.oscarConsultationRequest.pageUtil; *************** *** 55,272 **** public class EctConsultationFaxAction extends Action { ! ! String replaceIllegalCharacters(String str){ ! return str.replaceAll("&", "&").replaceAll(">",">").replaceAll("<","<"); ! } ! ! String replaceIllegalCharactersAmps(String str){ ! return str.replaceAll("&", "&"); ! } ! ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException ! { ! String curUser_no = (String) request.getSession().getAttribute("user"); ! ! if(curUser_no == null){ ! System.out.println("EJECTING"); ! return mapping.findForward("eject"); ! } ! ! OscarProperties props = OscarProperties.getInstance(); ! ! FaxClientLog faxClientLog = new FaxClientLog(curUser_no); ! ! EctConsultationFaxForm frm = (EctConsultationFaxForm)form; ! System.out.println("Provider = "+curUser_no+" has requested to send a fax"); ! String requestId = frm.getRequestId(); ! String sendingProvider = curUser_no; ! String locationId = getLocationId(); ! String identifier = props.getProperty("faxIdentifier", "zwf4t%8*9@s"); ! String recipentsFaxNumber = frm.getRecipientsFaxNumber(); ! String comments = frm.getComments(); ! String sendersFax = frm.getSendersFax(); ! String sendersPhone = frm.getSendersPhone(); ! String recipient = frm.getRecipient(); ! String from = frm.getFrom(); ! ! String appDate; ! String appTime; ! ! java.util.Calendar calender = java.util.Calendar.getInstance(); ! String day = Integer.toString(calender.get(java.util.Calendar.DAY_OF_MONTH)); ! String mon = Integer.toString(calender.get(java.util.Calendar.MONTH)+1); ! String year = Integer.toString(calender.get(java.util.Calendar.YEAR)); ! String hourOfDay = Integer.toString(calender.get(java.util.Calendar.HOUR_OF_DAY)); ! String minute = Integer.toString(calender.get(java.util.Calendar.MINUTE)); ! String formattedDate = year+"/"+mon+"/"+day+" "+hourOfDay+":"+minute; ! ! ClinicData clinic = new ClinicData(); ! String SIMPLE_SAMPLE_URI = props.getProperty("faxURI", "https://67.69.12.117:14043/OSCARFaxWebService"); ! ! System.setProperty("javax.net.ssl.trustStore", props.getProperty("faxKeystore", "/root/oscarFax/oscarFax.keystore")); ! HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() { ! public boolean verify(String urlHostname, SSLSession a) { ! return true; ! } ! }); ! ! oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestUtil reqFrm; ! reqFrm = new oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestUtil (); ! reqFrm.estRequestFromId(requestId); ! ! try{ ! if (Integer.parseInt(reqFrm.status) > 2 ){ ! appDate = reqFrm.appointmentDay+"/"+reqFrm.appointmentMonth+"/"+reqFrm.appointmentYear+" (d/m/y) "; ! }else{ ! appDate = ""; ! } ! }catch(Exception dateExcp){ appDate = ""; } try{ ! if (Integer.parseInt(reqFrm.status) > 2 ){ ! appTime = reqFrm.appointmentHour+":"+reqFrm.appointmentMinute+" "+reqFrm.appointmentPm; }else{ ! appTime = ""; ! } ! }catch(Exception timeExcp){ appTime = ""; } ! ! if (reqFrm.specPhone == null || reqFrm.specPhone.equals("null")){ reqFrm.specPhone = new String(); } ! if (reqFrm.specFax == null || reqFrm.specFax.equals("null")){ reqFrm.specFax = new String(); } ! if (reqFrm.specAddr == null || reqFrm.specAddr.equals("null")){ reqFrm.specAddr = new String(); } ! ! try { ! //URL endpoint = null; ! javax.xml.messaging.URLEndpoint endpoint = null; ! ! //endpoint=new URL(SIMPLE_SAMPLE_URI); ! endpoint= new javax.xml.messaging.URLEndpoint(SIMPLE_SAMPLE_URI); ! ! ! OSCARFAXClient OSFc = new OSCARFAXClient(); ! OSCARFAXSOAPMessage OFSm= OSFc.createOSCARFAXSOAPMessage(); ! ! OFSm.setSendingProvider(sendingProvider); ! OFSm.setLocationId(locationId); ! OFSm.setIdentifier(identifier); ! OFSm.setFaxType(OFSm.consultation); ! //OFSm.setRecipientFaxNumber("9055750779"); ! OFSm.setRecipientFaxNumber(recipentsFaxNumber); ! ! OFSm.setCoverSheet(true); ! OFSm.setComments(comments); ! OFSm.setSendersFax(sendersFax); ! OFSm.setSendersPhone(sendersPhone); ! OFSm.setDateOfSending(formattedDate); ! OFSm.setRecipient(recipient); ! OFSm.setFrom(from); ! ! ! ! SOAPElement payloadEle = OFSm.getPayLoad(); ! SOAPElement conPacket; ! ! ! conPacket = payloadEle.addChildElement("conPacket"); ! ! conPacket.addChildElement("clinicName").addTextNode(replaceIllegalCharacters( clinic.getClinicName() ) ); ! conPacket.addChildElement("clinicAddress").addTextNode(replaceIllegalCharacters(clinic.getClinicAddress()+", "+clinic.getClinicCity()+", "+clinic.getClinicProvince()+" "+clinic.getClinicPostal() )); ! conPacket.addChildElement("clinicTelephone").addTextNode(replaceIllegalCharacters(sendersPhone)); ! conPacket.addChildElement("clinicFax").addTextNode(replaceIllegalCharacters(sendersFax)); ! ! conPacket.addChildElement("consultDate").addTextNode(replaceIllegalCharacters(reqFrm.referalDate)); ! conPacket.addChildElement("status").addTextNode(replaceIllegalCharacters(urg(reqFrm.urgency))); ! conPacket.addChildElement("consultantName").addTextNode(replaceIllegalCharacters(reqFrm.getSpecailistsName(reqFrm.specialist))); ! conPacket.addChildElement("consultantService").addTextNode(replaceIllegalCharacters(reqFrm.getServiceName(reqFrm.service))); ! conPacket.addChildElement("consultantPhone").addTextNode(replaceIllegalCharacters(reqFrm.specPhone)); ! conPacket.addChildElement("consultantFax").addTextNode(replaceIllegalCharacters(reqFrm.specFax)); ! conPacket.addChildElement("consultantAddress").addTextNode(replaceIllegalCharactersAmps(reqFrm.specAddr)); ! conPacket.addChildElement("patientName").addTextNode(replaceIllegalCharacters(reqFrm.patientName)); ! conPacket.addChildElement("patientAddress").addTextNode(replaceIllegalCharactersAmps(reqFrm.patientAddress)); ! conPacket.addChildElement("patientTelephone").addTextNode(replaceIllegalCharacters(reqFrm.patientPhone)); ! conPacket.addChildElement("patientBirthdate").addTextNode(replaceIllegalCharacters(reqFrm.patientDOB )); ! conPacket.addChildElement("healthCardNo").addTextNode(replaceIllegalCharacters(reqFrm.patientHealthNum+" "+reqFrm.patientHealthCardVersionCode+" "+reqFrm.patientHealthCardType)); ! conPacket.addChildElement("appointmentDate").addTextNode(replaceIllegalCharacters(appDate)); ! conPacket.addChildElement("appointmentTime").addTextNode(replaceIllegalCharacters(appTime)); ! conPacket.addChildElement("chartNo").addTextNode(replaceIllegalCharacters(reqFrm.patientChartNo)); ! conPacket.addChildElement("reasonForConsultation").addTextNode(replaceIllegalCharacters(reqFrm.reasonForConsultation)); ! conPacket.addChildElement("pertinentClinicalInformation").addTextNode(replaceIllegalCharacters(reqFrm.clinicalInformation)); ! conPacket.addChildElement("significantConcurrentProblems").addTextNode(replaceIllegalCharacters(reqFrm.concurrentProblems)); ! conPacket.addChildElement("currentMedications").addTextNode(replaceIllegalCharacters(reqFrm.currentMedications)); ! conPacket.addChildElement("allergies").addTextNode(replaceIllegalCharacters(reqFrm.allergies)); ! conPacket.addChildElement("associatedWith").addTextNode(reqFrm.getProviderName(replaceIllegalCharacters(reqFrm.providerNo))); ! conPacket.addChildElement("familyDoctor").addTextNode(replaceIllegalCharacters(reqFrm.getFamilyDoctor())); ! ! OFSm.save(); ! ! boolean reply = OSFc.sendMessage(OFSm, endpoint); ! ! try{ ! if (reply){ ! System.out.println("Job Id "+OSFc.getJobId()); ! request.setAttribute("jobId",OSFc.getJobId()); ! System.out.println("Request Id "+OSFc.getRequestId()); ! request.setAttribute("requestId",OSFc.getRequestId()); ! faxClientLog.setFaxRequestId(OSFc.getJobId(),OSFc.getRequestId()); ! }else{ ! System.out.println("Error Message "+OSFc.getErrorMessage()); ! request.setAttribute("oscarFaxError",OSFc.getErrorMessage()); ! faxClientLog.setResult(OSFc.getErrorMessage()); ! } ! }catch(Exception e4){ ! e4.printStackTrace(); ! System.out.println("Fax Service has Returned a Fatal Error "); ! request.setAttribute("oscarFaxError","Fax Service Is currently not available, please contact your Oscar Fax Administrator"); ! faxClientLog.setResult("FAX SERVICE RETURNED NULL"); ! } ! ! ! ! ! ! ! ! } catch(Throwable e) { ! e.printStackTrace(); ! } ! System.out.println("Client Has Finished Running"); ! ! ! ! ! ! ! ! return mapping.findForward("success"); ! ! } ! String getLocationId(){ ! String retval = ""; ! try ! { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql = "select locationId from oscarcommlocations where current = '1' "; ! ResultSet rs = db.GetSQL(sql); ! if(rs.next()) ! retval = rs.getString("locationId"); ! db.CloseConn(); ! } ! catch(SQLException e) ! { ! System.out.println(e.getMessage()); } ! return retval; ! } ! public String urg(String str){ ! String retval = ""; ! if (str.equals("1")){ ! retval = "Urgent"; ! }else if(str.equals("2")){ ! retval = "Non-Urgent"; ! }else if (str.equals("3")){ ! retval = "Return"; ! } ! return retval; ! } ! } --- 55,269 ---- public class EctConsultationFaxAction extends Action { ! ! String replaceIllegalCharacters(String str){ ! return str.replaceAll("&", "&").replaceAll(">",">").replaceAll("<","<"); ! } ! ! String replaceIllegalCharactersAmps(String str){ ! return str.replaceAll("&", "&"); ! } ! ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException { ! String curUser_no = (String) request.getSession().getAttribute("user"); ! ! if(curUser_no == null){ ! System.out.println("EJECTING"); ! return mapping.findForward("eject"); ! } ! ! OscarProperties props = OscarProperties.getInstance(); ! ! FaxClientLog faxClientLog = new FaxClientLog(curUser_no); ! ! EctConsultationFaxForm frm = (EctConsultationFaxForm)form; ! System.out.println("Provider = "+curUser_no+" has requested to send a fax"); ! String requestId = frm.getRequestId(); ! String sendingProvider = curUser_no; ! String locationId = getLocationId(); ! String identifier = props.getProperty("faxIdentifier", "zwf4t%8*9@s"); ! String recipentsFaxNumber = frm.getRecipientsFaxNumber(); ! String comments = frm.getComments(); ! String sendersFax = frm.getSendersFax(); ! String sendersPhone = frm.getSendersPhone(); ! String recipient = frm.getRecipient(); ! String from = frm.getFrom(); ! ! String appDate; ! String appTime; ! ! java.util.Calendar calender = java.util.Calendar.getInstance(); ! String day = Integer.toString(calender.get(java.util.Calendar.DAY_OF_MONTH)); ! String mon = Integer.toString(calender.get(java.util.Calendar.MONTH)+1); ! String year = Integer.toString(calender.get(java.util.Calendar.YEAR)); ! String hourOfDay = Integer.toString(calender.get(java.util.Calendar.HOUR_OF_DAY)); ! String minute = Integer.toString(calender.get(java.util.Calendar.MINUTE)); ! String formattedDate = year+"/"+mon+"/"+day+" "+hourOfDay+":"+minute; ! ! ClinicData clinic = new ClinicData(); ! String SIMPLE_SAMPLE_URI = props.getProperty("faxURI", "https://67.69.12.117:14043/OSCARFaxWebService"); ! ! System.setProperty("javax.net.ssl.trustStore", props.getProperty("faxKeystore", "/root/oscarFax/oscarFax.keystore")); ! HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() { ! public boolean verify(String urlHostname, SSLSession a) { ! return true; ! } ! }); ! ! oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestUtil reqFrm; ! reqFrm = new oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestUtil(); ! reqFrm.estRequestFromId(requestId); ! ! try{ ! if (Integer.parseInt(reqFrm.status) > 2 ){ ! appDate = reqFrm.appointmentDay+"/"+reqFrm.appointmentMonth+"/"+reqFrm.appointmentYear+" (d/m/y) "; ! }else{ ! appDate = ""; ! } ! }catch(Exception dateExcp){ appDate = ""; } + try{ + if (Integer.parseInt(reqFrm.status) > 2 ){ + appTime = reqFrm.appointmentHour+":"+reqFrm.appointmentMinute+" "+reqFrm.appointmentPm; + }else{ + appTime = ""; + } + }catch(Exception timeExcp){ appTime = ""; } + + if (reqFrm.specPhone == null || reqFrm.specPhone.equals("null")){ reqFrm.specPhone = new String(); } + if (reqFrm.specFax == null || reqFrm.specFax.equals("null")){ reqFrm.specFax = new String(); } + if (reqFrm.specAddr == null || reqFrm.specAddr.equals("null")){ reqFrm.specAddr = new String(); } + + try { + //URL endpoint = null; + javax.xml.messaging.URLEndpoint endpoint = null; + + //endpoint=new URL(SIMPLE_SAMPLE_URI); + endpoint= new javax.xml.messaging.URLEndpoint(SIMPLE_SAMPLE_URI); + + + OSCARFAXClient OSFc = new OSCARFAXClient(); + OSCARFAXSOAPMessage OFSm= OSFc.createOSCARFAXSOAPMessage(); + + OFSm.setSendingProvider(sendingProvider); + OFSm.setLocationId(locationId); + OFSm.setIdentifier(identifier); + OFSm.setFaxType(OFSm.consultation); + //OFSm.setRecipientFaxNumber("9055750779"); + OFSm.setRecipientFaxNumber(recipentsFaxNumber); + + OFSm.setCoverSheet(true); + OFSm.setComments(comments); + OFSm.setSendersFax(sendersFax); + OFSm.setSendersPhone(sendersPhone); + OFSm.setDateOfSending(formattedDate); + OFSm.setRecipient(recipient); + OFSm.setFrom(from); + + + + SOAPElement payloadEle = OFSm.getPayLoad(); + SOAPElement conPacket; + + + conPacket = payloadEle.addChildElement("conPacket"); + + conPacket.addChildElement("clinicName").addTextNode(replaceIllegalCharacters( clinic.getClinicName() ) ); + conPacket.addChildElement("clinicAddress").addTextNode(replaceIllegalCharacters(clinic.getClinicAddress()+", "+clinic.getClinicCity()+", "+clinic.getClinicProvince()+" "+clinic.getClinicPostal() )); + conPacket.addChildElement("clinicTelephone").addTextNode(replaceIllegalCharacters(sendersPhone)); + conPacket.addChildElement("clinicFax").addTextNode(replaceIllegalCharacters(sendersFax)); + + conPacket.addChildElement("consultDate").addTextNode(replaceIllegalCharacters(reqFrm.referalDate)); + conPacket.addChildElement("status").addTextNode(replaceIllegalCharacters(urg(reqFrm.urgency))); + conPacket.addChildElement("consultantName").addTextNode(replaceIllegalCharacters(reqFrm.getSpecailistsName(reqFrm.specialist))); + conPacket.addChildElement("consultantService").addTextNode(replaceIllegalCharacters(reqFrm.getServiceName(reqFrm.service))); + conPacket.addChildElement("consultantPhone").addTextNode(replaceIllegalCharacters(reqFrm.specPhone)); + conPacket.addChildElement("consultantFax").addTextNode(replaceIllegalCharacters(reqFrm.specFax)); + conPacket.addChildElement("consultantAddress").addTextNode(replaceIllegalCharactersAmps(reqFrm.specAddr)); + conPacket.addChildElement("patientName").addTextNode(replaceIllegalCharacters(reqFrm.patientName)); + conPacket.addChildElement("patientAddress").addTextNode(replaceIllegalCharactersAmps(reqFrm.patientAddress)); + conPacket.addChildElement("patientTelephone").addTextNode(replaceIllegalCharacters(reqFrm.patientPhone)); + conPacket.addChildElement("patientBirthdate").addTextNode(replaceIllegalCharacters(reqFrm.patientDOB )); + conPacket.addChildElement("healthCardNo").addTextNode(replaceIllegalCharacters(reqFrm.patientHealthNum+" "+reqFrm.patientHealthCardVersionCode+" "+reqFrm.patientHealthCardType)); + conPacket.addChildElement("appointmentDate").addTextNode(replaceIllegalCharacters(appDate)); + conPacket.addChildElement("appointmentTime").addTextNode(replaceIllegalCharacters(appTime)); + conPacket.addChildElement("chartNo").addTextNode(replaceIllegalCharacters(reqFrm.patientChartNo)); + conPacket.addChildElement("reasonForConsultation").addTextNode(replaceIllegalCharacters(reqFrm.reasonForConsultation)); + conPacket.addChildElement("pertinentClinicalInformation").addTextNode(replaceIllegalCharacters(reqFrm.clinicalInformation)); + conPacket.addChildElement("significantConcurrentProblems").addTextNode(replaceIllegalCharacters(reqFrm.concurrentProblems)); + conPacket.addChildElement("currentMedications").addTextNode(replaceIllegalCharacters(reqFrm.currentMedications)); + conPacket.addChildElement("allergies").addTextNode(replaceIllegalCharacters(reqFrm.allergies)); + conPacket.addChildElement("associatedWith").addTextNode(reqFrm.getProviderName(replaceIllegalCharacters(reqFrm.providerNo))); + conPacket.addChildElement("familyDoctor").addTextNode(replaceIllegalCharacters(reqFrm.getFamilyDoctor())); + + OFSm.save(); + + boolean reply = OSFc.sendMessage(OFSm, endpoint); + try{ ! if (reply){ ! System.out.println("Job Id "+OSFc.getJobId()); ! request.setAttribute("jobId",OSFc.getJobId()); ! System.out.println("Request Id "+OSFc.getRequestId()); ! request.setAttribute("requestId",OSFc.getRequestId()); ! faxClientLog.setFaxRequestId(OSFc.getJobId(),OSFc.getRequestId()); }else{ ! System.out.println("Error Message "+OSFc.getErrorMessage()); ! request.setAttribute("oscarFaxError",OSFc.getErrorMessage()); ! faxClientLog.setResult(OSFc.getErrorMessage()); } ! }catch(Exception e4){ ! e4.printStackTrace(); ! System.out.println("Fax Service has Returned a Fatal Error "); ! request.setAttribute("oscarFaxError","Fax Service Is currently not available, please contact your Oscar Fax Administrator"); ! faxClientLog.setResult("FAX SERVICE RETURNED NULL"); ! } ! ! ! ! ! ! ! ! } catch(Throwable e) { ! e.printStackTrace(); ! } ! System.out.println("Client Has Finished Running"); ! ! ! ! ! ! ! ! return mapping.findForward("success"); ! ! } ! String getLocationId(){ ! String retval = ""; ! try { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql = "select locationId from oscarcommlocations where current = '1' "; ! ResultSet rs = db.GetSQL(sql); ! if(rs.next()) ! retval = rs.getString("locationId"); ! db.CloseConn(); ! } ! catch(SQLException e) { ! System.out.println(e.getMessage()); ! } ! return retval; ! } ! public String urg(String str){ ! String retval = ""; ! if (str.equals("1")){ ! retval = "Urgent"; ! }else if(str.equals("2")){ ! retval = "Non-Urgent"; ! }else if (str.equals("3")){ ! retval = "Return"; ! } ! return retval; ! } ! } |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:03:57
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2366 Modified Files: EctConEditSpecialistsAction.java Log Message: Changed method perform to execute 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.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EctConEditSpecialistsAction.java 21 Jul 2004 15:00:48 -0000 1.5 --- EctConEditSpecialistsAction.java 28 Dec 2004 18:03:47 -0000 1.6 *************** *** 1,24 **** /* ! * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! * * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster Unviersity ! * Hamilton ! * Ontario, Canada */ package oscar.oscarEncounter.oscarConsultationRequest.config.pageUtil; --- 1,24 ---- /* ! * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 ! * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! * * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster University ! * Hamilton ! * Ontario, Canada */ package oscar.oscarEncounter.oscarConsultationRequest.config.pageUtil; *************** *** 36,133 **** import java.util.ResourceBundle; ! public class EctConEditSpecialistsAction extends Action ! { ! ! public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException ! { ! System.out.println("Entering EditSpecialistsAction Jackson"); ! EctConEditSpecialistsForm editSpecialistsForm = (EctConEditSpecialistsForm)form; ! String specId = editSpecialistsForm.getSpecId(); ! String delete = editSpecialistsForm.getDelete(); ! String specialists[] = editSpecialistsForm.getSpecialists(); ! System.out.println(String.valueOf(String.valueOf((new StringBuffer("===>")).append(delete).append("<===")))); ! ! ResourceBundle oscarR = ResourceBundle.getBundle("oscarResources",request.getLocale()); ! ! if(delete.equals(oscarR.getString("oscarEncounter.oscarConsultationRequest.config.EditSpecialists.btnDeleteSpecialist"))) ! { ! if(specialists.length > 0) ! { ! StringBuffer stringBuffer = new StringBuffer(); ! for(int i = 0; i < specialists.length; i++) ! if(i == specialists.length - 1) ! stringBuffer.append(String.valueOf(String.valueOf((new StringBuffer(" specId = ")).append(specialists[i])))); ! else ! stringBuffer.append(String.valueOf(String.valueOf((new StringBuffer(" specId = ")).append(specialists[i]).append(" or ")))); ! ! try ! { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql = "delete from professionalSpecialists where ".concat(String.valueOf(String.valueOf(stringBuffer.toString()))); ! db.RunSQL(sql); ! db.CloseConn(); ! } ! catch(SQLException e) ! { ! System.out.println(e.getMessage()); ! } } ! EctConConstructSpecialistsScriptsFile constructSpecialistsScriptsFile = new EctConConstructSpecialistsScriptsFile(); ! constructSpecialistsScriptsFile.makeString(); ! return mapping.findForward("delete"); ! } ! String fName = new String(); ! String lName = new String(); ! String proLetters = new String(); ! String address = new String(); ! String phone = new String(); ! String fax = new String(); ! String website = new String(); ! String email = new String(); ! String specType = new String(); ! int updater = 0; ! try ! { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql = String.valueOf(String.valueOf((new StringBuffer("select * from professionalSpecialists where specId = ")).append(specId))); ! ResultSet rs; ! for(rs = db.GetSQL(sql); rs.next();) ! { ! fName = rs.getString("fName"); ! lName = rs.getString("lName"); ! proLetters = rs.getString("proLetters"); ! address = rs.getString("address"); ! phone = rs.getString("phone"); ! fax = rs.getString("fax"); ! website = rs.getString("website"); ! email = rs.getString("email"); ! specType = rs.getString("specType"); ! updater = 1; } ! ! rs.close(); ! db.CloseConn(); ! } ! catch(SQLException e) ! { ! System.out.println(e.getMessage()); ! } ! request.setAttribute("fName", fName); ! request.setAttribute("lName", lName); ! request.setAttribute("proLetters", proLetters); ! request.setAttribute("address", address); ! request.setAttribute("phone", phone); ! request.setAttribute("fax", fax); ! request.setAttribute("website", website); ! request.setAttribute("email", email); ! request.setAttribute("specType", specType); ! request.setAttribute("specId", specId); ! request.setAttribute("upd", new Integer(updater)); ! EctConConstructSpecialistsScriptsFile constructSpecialistsScriptsFile = new EctConConstructSpecialistsScriptsFile(); ! request.setAttribute("verd", constructSpecialistsScriptsFile.makeFile()); ! constructSpecialistsScriptsFile.makeString(); ! return mapping.findForward("success"); ! } } --- 36,124 ---- import java.util.ResourceBundle; ! public class EctConEditSpecialistsAction extends Action { ! ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException { ! System.out.println("Entering EditSpecialistsAction Jackson"); ! EctConEditSpecialistsForm editSpecialistsForm = (EctConEditSpecialistsForm)form; ! String specId = editSpecialistsForm.getSpecId(); ! String delete = editSpecialistsForm.getDelete(); ! String specialists[] = editSpecialistsForm.getSpecialists(); ! System.out.println(String.valueOf(String.valueOf((new StringBuffer("===>")).append(delete).append("<===")))); ! ! ResourceBundle oscarR = ResourceBundle.getBundle("oscarResources",request.getLocale()); ! ! if(delete.equals(oscarR.getString("oscarEncounter.oscarConsultationRequest.config.EditSpecialists.btnDeleteSpecialist"))) { ! if(specialists.length > 0) { ! StringBuffer stringBuffer = new StringBuffer(); ! for(int i = 0; i < specialists.length; i++) ! if(i == specialists.length - 1) ! stringBuffer.append(String.valueOf(String.valueOf((new StringBuffer(" specId = ")).append(specialists[i])))); ! else ! stringBuffer.append(String.valueOf(String.valueOf((new StringBuffer(" specId = ")).append(specialists[i]).append(" or ")))); ! ! try { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql = "delete from professionalSpecialists where ".concat(String.valueOf(String.valueOf(stringBuffer.toString()))); ! db.RunSQL(sql); ! db.CloseConn(); } ! catch(SQLException e) { ! System.out.println(e.getMessage()); } ! } ! EctConConstructSpecialistsScriptsFile constructSpecialistsScriptsFile = new EctConConstructSpecialistsScriptsFile(); ! constructSpecialistsScriptsFile.makeString(); ! return mapping.findForward("delete"); ! } ! String fName = new String(); ! String lName = new String(); ! String proLetters = new String(); ! String address = new String(); ! String phone = new String(); ! String fax = new String(); ! String website = new String(); ! String email = new String(); ! String specType = new String(); ! int updater = 0; ! try { ! DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql = String.valueOf(String.valueOf((new StringBuffer("select * from professionalSpecialists where specId = ")).append(specId))); ! ResultSet rs; ! for(rs = db.GetSQL(sql); rs.next();) { ! fName = rs.getString("fName"); ! lName = rs.getString("lName"); ! proLetters = rs.getString("proLetters"); ! address = rs.getString("address"); ! phone = rs.getString("phone"); ! fax = rs.getString("fax"); ! website = rs.getString("website"); ! email = rs.getString("email"); ! specType = rs.getString("specType"); ! updater = 1; ! } ! ! rs.close(); ! db.CloseConn(); ! } ! catch(SQLException e) { ! System.out.println(e.getMessage()); ! } ! request.setAttribute("fName", fName); ! request.setAttribute("lName", lName); ! request.setAttribute("proLetters", proLetters); ! request.setAttribute("address", address); ! request.setAttribute("phone", phone); ! request.setAttribute("fax", fax); ! request.setAttribute("website", website); ! request.setAttribute("email", email); ! request.setAttribute("specType", specType); ! request.setAttribute("specId", specId); ! request.setAttribute("upd", new Integer(updater)); ! EctConConstructSpecialistsScriptsFile constructSpecialistsScriptsFile = new EctConConstructSpecialistsScriptsFile(); ! request.setAttribute("verd", constructSpecialistsScriptsFile.makeFile()); ! constructSpecialistsScriptsFile.makeString(); ! return mapping.findForward("success"); ! } } |
|
From: Jay G. <jay...@us...> - 2004-12-28 18:02:53
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2178 Modified Files: EctImmLoadConfigAction.java Log Message: Changed method perform to execute Index: EctImmLoadConfigAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil/EctImmLoadConfigAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EctImmLoadConfigAction.java 26 Feb 2004 14:47:04 -0000 1.4 --- EctImmLoadConfigAction.java 28 Dec 2004 18:02:44 -0000 1.5 *************** *** 18,22 **** // * This software was written for the // * Department of Family Medicine ! // * McMaster Unviersity // * Hamilton // * Ontario, Canada --- 18,22 ---- // * This software was written for the // * Department of Family Medicine ! // * McMaster University // * Hamilton // * Ontario, Canada *************** *** 41,45 **** public final class EctImmLoadConfigAction extends Action { ! public ActionForward perform( ActionMapping mapping, ActionForm form, --- 41,45 ---- public final class EctImmLoadConfigAction extends Action { ! public ActionForward execute( ActionMapping mapping, ActionForm form, |
