oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil MsgClearMessageAction.java,1.3,1.4

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18915

Modified Files:
	MsgClearMessageAction.java 
Log Message:
Change method perform to execute



Index: MsgClearMessageAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgClearMessageAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MsgClearMessageAction.java	11 Sep 2003 20:53:35 -0000	1.3
--- MsgClearMessageAction.java	28 Dec 2004 16:47:19 -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,

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/pageUtil EctImmDeleteImmunizationSetAction.java,1.6,1.7

[Jay G. <jay...@us...>]

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-serv18594

Modified Files:
	EctImmDeleteImmunizationSetAction.java 
Log Message:
Change method perform to execute



Index: EctImmDeleteImmunizationSetAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/pageUtil/EctImmDeleteImmunizationSetAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** EctImmDeleteImmunizationSetAction.java	28 Dec 2004 16:44:47 -0000	1.6
--- EctImmDeleteImmunizationSetAction.java	28 Dec 2004 16:45:43 -0000	1.7
***************
*** 1,24 ****
  /*
!  * 
   * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
!  * This software is published under the GPL GNU General Public License. 
!  * This program is free software; you can redistribute it and/or 
!  * modify it under the terms of the GNU General Public License 
!  * as published by the Free Software Foundation; either version 2 
!  * of the License, or (at your option) any later version. * 
!  * This program is distributed in the hope that it will be useful, 
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
!  * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License 
!  * along with this program; if not, write to the Free Software 
!  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 
!  * 
   * <OSCAR TEAM>
!  * 
!  * This software was written for the 
!  * Department of Family Medicine 
!  * McMaster University 
!  * 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;
***************
*** 33,67 ****
  import oscar.oscarDB.DBHandler;
  
! public class EctImmDeleteImmunizationSetAction extends Action
! {
! 
!     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!         throws ServletException, IOException
!     {
!         EctImmDeleteImmunizationSetForm frm = (EctImmDeleteImmunizationSetForm)form;
!         String sets[] = frm.getImmuSets();
!         StringBuffer stringBuffer = new StringBuffer(" Update config_Immunization set archived = 1 where ");
!         for(int i = 0; i < sets.length; i++)
!         {
!             System.out.println(String.valueOf(String.valueOf((new StringBuffer("set len ")).append(sets.length - 1).append(" i = ").append(i))));
!             if(i == sets.length - 1)
!                 stringBuffer.append("setId = ".concat(String.valueOf(String.valueOf(sets[i]))));
!             else
!                 stringBuffer.append(String.valueOf(String.valueOf((new StringBuffer("setId = ")).append(sets[i]).append(" or "))));
!         }
! 
!         if(sets.length > 0)
!             try
!             {
!                 DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!                 String sql = stringBuffer.toString();
!                 db.RunSQL(sql);
!                 db.CloseConn();
!             }
!             catch(SQLException e)
!             {
!                 System.out.println(e.getMessage());
!             }
!         return mapping.findForward("success");
!     }
  }
--- 33,62 ----
  import oscar.oscarDB.DBHandler;
  
! public class EctImmDeleteImmunizationSetAction extends Action {
!    
!    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!    throws ServletException, IOException {
!       EctImmDeleteImmunizationSetForm frm = (EctImmDeleteImmunizationSetForm)form;
!       String sets[] = frm.getImmuSets();
!       StringBuffer stringBuffer = new StringBuffer(" Update config_Immunization set archived = 1 where ");
!       for(int i = 0; i < sets.length; i++) {
!          System.out.println(String.valueOf(String.valueOf((new StringBuffer("set len ")).append(sets.length - 1).append(" i = ").append(i))));
!          if(i == sets.length - 1)
!             stringBuffer.append("setId = ".concat(String.valueOf(String.valueOf(sets[i]))));
!          else
!             stringBuffer.append(String.valueOf(String.valueOf((new StringBuffer("setId = ")).append(sets[i]).append(" or "))));
!       }
!       
!       if(sets.length > 0)
!          try {
!             DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!             String sql = stringBuffer.toString();
!             db.RunSQL(sql);
!             db.CloseConn();
!          }
!          catch(SQLException e) {
!             System.out.println(e.getMessage());
!          }
!       return mapping.findForward("success");
!    }
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/pageUtil EctImmDeleteImmunizationSetAction.java,1.5,1.6

[Jay G. <jay...@us...>]

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-serv18454

Modified Files:
	EctImmDeleteImmunizationSetAction.java 
Log Message:
Change method perform to execute



Index: EctImmDeleteImmunizationSetAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/pageUtil/EctImmDeleteImmunizationSetAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EctImmDeleteImmunizationSetAction.java	21 Jul 2004 14:58:59 -0000	1.5
--- EctImmDeleteImmunizationSetAction.java	28 Dec 2004 16:44:47 -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 
***************
*** 36,40 ****
  {
  
!     public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
          throws ServletException, IOException
      {
--- 36,40 ----
  {
  
!     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
          throws ServletException, IOException
      {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil EctConsultationFormRequestAction.java,1.7,1.8

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18165

Modified Files:
	EctConsultationFormRequestAction.java 
Log Message:
Change method perform to execute



Index: EctConsultationFormRequestAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** EctConsultationFormRequestAction.java	9 Aug 2004 20:23:42 -0000	1.7
--- EctConsultationFormRequestAction.java	28 Dec 2004 16:42:29 -0000	1.8
***************
*** 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;
***************
*** 39,141 ****
  
  public class EctConsultationFormRequestAction extends Action {
! 
!     public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!         throws ServletException, IOException
!     {
!         //EctSessionBean bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean");
!         //if(bean == null)
!         //    return mapping.findForward("eject");
!         EctConsultationFormRequestForm frm = (EctConsultationFormRequestForm)form;
!         String referalDate = frm.getReferalDate();
!         String serviceId = frm.getService();
!         String specId = frm.getSpecialist();
!         String appointmentDate = String.valueOf(String.valueOf((new StringBuffer(String.valueOf(String.valueOf(frm.getAppointmentYear())))).append("/").append(frm.getAppointmentMonth()).append("/").append(frm.getAppointmentDay())));
!         String appointmentHour = frm.getAppointmentHour();
!         String appointmentPm = frm.getAppointmentPm();
!         if(appointmentPm.equals("PM"))
!         {
!             appointmentHour = Integer.toString(Integer.parseInt(appointmentHour) + 12);
!             System.out.println(String.valueOf(String.valueOf((new StringBuffer("\n\n\nlook at the time")).append(appointmentHour).append("\n\n\n"))));
!         }
!         String appointmentTime = String.valueOf(String.valueOf((new StringBuffer(String.valueOf(String.valueOf(appointmentHour)))).append(":").append(frm.getAppointmentMinute())));
!         String reason = frm.getReasonForConsultation();
!         String clinicalInfo = frm.getClinicalInformation();
!         String currentMeds = frm.getCurrentMedications();
!         String allergies = frm.getAllergies();
!         String concurrentProblems = frm.getConcurrentProblems();
!         String sendTo = frm.getSendTo();
!         String submission = frm.getSubmission();
!         String providerNo = frm.getProviderNo();
!         String demographicNo = frm.getDemographicNo();
!         String status = frm.getStatus();
!         String statusText = frm.getAppointmentNotes();
!         String urg = frm.getUrgency();
!         String requestId = "";
!         MsgStringQuote str = new MsgStringQuote();
!         if(submission.equals("Submit Consultation Request") || submission.equals("Submit Consultation Request And Print Preview") || submission.equals("Submit And Fax"))
!         {
!             try
!             {
!                 DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!                 String sql = "insert into consultationRequests "
!                             +"(referalDate,serviceId,specId,appointmentDate,appointmentTime,reason,"
!                             +"clinicalInfo,currentMeds,allergies,providerNo,demographicNo,status,statusText,sendTo,concurrentProblems,urgency) "
!                             +" values ('"+str.q(referalDate)+"','"+str.q(serviceId)+"','"+str.q(specId)+"','"+str.q(appointmentDate)+"','"+str.q(appointmentTime)+"', "
!                             +"'"+str.q(reason)+"','"+str.q(clinicalInfo)+"','"+str.q(currentMeds)+"','"+str.q(allergies)+"','"+str.q(providerNo)+"','"+str.q(demographicNo)
!                             +"','"+str.q(status)+"','"+str.q(statusText)+"','"+str.q(sendTo)+"','"+str.q(concurrentProblems)+"','"+urg+"')";
!                 System.out.println(" sql statement "+sql);
!                 db.RunSQL(sql);
! 
! 		/* select the correct db specific command */
!                 String db_type = OscarProperties.getInstance().getProperty("db_type").trim();
!                 String dbSpecificCommand;
!                 if (db_type.equalsIgnoreCase("mysql")) {
!                             dbSpecificCommand = "SELECT LAST_INSERT_ID()";
!                 } else if (db_type.equalsIgnoreCase("postgresql")){
!                             dbSpecificCommand = "SELECT CURRVAL('consultationrequests_numeric')";
!                 } else
!                             throw new SQLException("ERROR: Database " + db_type + " unrecognized.");
! 
!                 ResultSet rs = db.GetSQL(dbSpecificCommand);
!                 if(rs.next())
!                     requestId = Integer.toString(rs.getInt(1));
!                 db.CloseConn();
!             }
!             catch(SQLException e)
!             {
!                 System.out.println(e.getMessage());
!             }
!             request.setAttribute("transType", "2");
!         } else
!         if(submission.equals("Update Consultation Request") || submission.equals("Update Consultation Request And Print Preview") || submission.equals("Update And Fax"))
!         {
              requestId = frm.getRequestId();
              System.out.println("request id = ".concat(String.valueOf(String.valueOf(frm.getRequestId()))));
!             try
!             {
!                 DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!                 String sql = String.valueOf(String.valueOf((new StringBuffer("update consultationRequests set  serviceId = '")).append(str.q(serviceId)).append("', ").append(" specId = '").append(str.q(specId)).append("', ").append(" appointmentDate = '").append(str.q(appointmentDate)).append("', ").append(" appointmentTime = '").append(str.q(appointmentTime)).append("', ").append(" reason = '").append(str.q(reason)).append("', ").append(" clinicalInfo = '").append(str.q(clinicalInfo)).append("', ").append(" currentMeds = '").append(str.q(currentMeds)).append("', ").append(" allergies = '").append(str.q(allergies)).append("', ").append(" status = '").append(str.q(status)).append("', ").append(" statusText = '").append(str.q(statusText)).append("', ").append(" sendTo = '").append(str.q(sendTo)).append("', ").append(" urgency = '").append(urg).append("', ").append(" concurrentProblems = '").append(str.q(concurrentProblems)).append("' ").append(" where requestId = '").append(str.q(requestId)).append("'")));
!                 db.RunSQL(sql);
!                 db.CloseConn();
              }
!             catch(SQLException e)
!             {
!                 System.out.println(e.getMessage());
              }
              request.setAttribute("transType", "1");
!         }
!         frm.setRequestId("");
!         request.setAttribute("teamVar",sendTo);
!         if(submission.equals("Update Consultation Request And Print Preview") || submission.equals("Submit Consultation Request And Print Preview")){
!             request.setAttribute("reqId", requestId);
!             return mapping.findForward("print");
!         } else if (submission.equals("Update And Fax") || submission.equals("Submit And Fax")) {
!             request.setAttribute("reqId", requestId);
!             return mapping.findForward("fax");
!         } else {            
!             ParameterActionForward forward = new ParameterActionForward(mapping.findForward("success"));
!             forward.addParameter("de", demographicNo);                     
!             return forward;  
!         }
!     }
  }
--- 39,133 ----
  
  public class EctConsultationFormRequestAction extends Action {
!    
!    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!    throws ServletException, IOException {
!       //EctSessionBean bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean");
!       //if(bean == null)
!       //    return mapping.findForward("eject");
!       EctConsultationFormRequestForm frm = (EctConsultationFormRequestForm)form;
!       String referalDate = frm.getReferalDate();
!       String serviceId = frm.getService();
!       String specId = frm.getSpecialist();
!       String appointmentDate = String.valueOf(String.valueOf((new StringBuffer(String.valueOf(String.valueOf(frm.getAppointmentYear())))).append("/").append(frm.getAppointmentMonth()).append("/").append(frm.getAppointmentDay())));
!       String appointmentHour = frm.getAppointmentHour();
!       String appointmentPm = frm.getAppointmentPm();
!       if(appointmentPm.equals("PM")) {
!          appointmentHour = Integer.toString(Integer.parseInt(appointmentHour) + 12);
!          System.out.println(String.valueOf(String.valueOf((new StringBuffer("\n\n\nlook at the time")).append(appointmentHour).append("\n\n\n"))));
!       }
!       String appointmentTime = String.valueOf(String.valueOf((new StringBuffer(String.valueOf(String.valueOf(appointmentHour)))).append(":").append(frm.getAppointmentMinute())));
!       String reason = frm.getReasonForConsultation();
!       String clinicalInfo = frm.getClinicalInformation();
!       String currentMeds = frm.getCurrentMedications();
!       String allergies = frm.getAllergies();
!       String concurrentProblems = frm.getConcurrentProblems();
!       String sendTo = frm.getSendTo();
!       String submission = frm.getSubmission();
!       String providerNo = frm.getProviderNo();
!       String demographicNo = frm.getDemographicNo();
!       String status = frm.getStatus();
!       String statusText = frm.getAppointmentNotes();
!       String urg = frm.getUrgency();
!       String requestId = "";
!       MsgStringQuote str = new MsgStringQuote();
!       if(submission.equals("Submit Consultation Request") || submission.equals("Submit Consultation Request And Print Preview") || submission.equals("Submit And Fax")) {
!          try {
!             DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!             String sql = "insert into consultationRequests "
!             +"(referalDate,serviceId,specId,appointmentDate,appointmentTime,reason,"
!             +"clinicalInfo,currentMeds,allergies,providerNo,demographicNo,status,statusText,sendTo,concurrentProblems,urgency) "
!             +" values ('"+str.q(referalDate)+"','"+str.q(serviceId)+"','"+str.q(specId)+"','"+str.q(appointmentDate)+"','"+str.q(appointmentTime)+"', "
!             +"'"+str.q(reason)+"','"+str.q(clinicalInfo)+"','"+str.q(currentMeds)+"','"+str.q(allergies)+"','"+str.q(providerNo)+"','"+str.q(demographicNo)
!             +"','"+str.q(status)+"','"+str.q(statusText)+"','"+str.q(sendTo)+"','"+str.q(concurrentProblems)+"','"+urg+"')";
!             System.out.println(" sql statement "+sql);
!             db.RunSQL(sql);
!             
!             /* select the correct db specific command */
!             String db_type = OscarProperties.getInstance().getProperty("db_type").trim();
!             String dbSpecificCommand;
!             if (db_type.equalsIgnoreCase("mysql")) {
!                dbSpecificCommand = "SELECT LAST_INSERT_ID()";
!             } else if (db_type.equalsIgnoreCase("postgresql")){
!                dbSpecificCommand = "SELECT CURRVAL('consultationrequests_numeric')";
!             } else
!                throw new SQLException("ERROR: Database " + db_type + " unrecognized.");
!             
!             ResultSet rs = db.GetSQL(dbSpecificCommand);
!             if(rs.next())
!                requestId = Integer.toString(rs.getInt(1));
!             db.CloseConn();
!          }
!          catch(SQLException e) {
!             System.out.println(e.getMessage());
!          }
!          request.setAttribute("transType", "2");
!       } else
!          if(submission.equals("Update Consultation Request") || submission.equals("Update Consultation Request And Print Preview") || submission.equals("Update And Fax")) {
              requestId = frm.getRequestId();
              System.out.println("request id = ".concat(String.valueOf(String.valueOf(frm.getRequestId()))));
!             try {
!                DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!                String sql = String.valueOf(String.valueOf((new StringBuffer("update consultationRequests set  serviceId = '")).append(str.q(serviceId)).append("', ").append(" specId = '").append(str.q(specId)).append("', ").append(" appointmentDate = '").append(str.q(appointmentDate)).append("', ").append(" appointmentTime = '").append(str.q(appointmentTime)).append("', ").append(" reason = '").append(str.q(reason)).append("', ").append(" clinicalInfo = '").append(str.q(clinicalInfo)).append("', ").append(" currentMeds = '").append(str.q(currentMeds)).append("', ").append(" allergies = '").append(str.q(allergies)).append("', ").append(" status = '").append(str.q(status)).append("', ").append(" statusText = '").append(str.q(statusText)).append("', ").append(" sendTo = '").append(str.q(sendTo)).append("', ").append(" urgency = '").append(urg).append("', ").append(" concurrentProblems = '").append(str.q(concurrentProblems)).append("' ").append(" where requestId = '").append(str.q(requestId)).append("'")));
!                db.RunSQL(sql);
!                db.CloseConn();
              }
!             catch(SQLException e) {
!                System.out.println(e.getMessage());
              }
              request.setAttribute("transType", "1");
!          }
!       frm.setRequestId("");
!       request.setAttribute("teamVar",sendTo);
!       if(submission.equals("Update Consultation Request And Print Preview") || submission.equals("Submit Consultation Request And Print Preview")){
!          request.setAttribute("reqId", requestId);
!          return mapping.findForward("print");
!       } else if (submission.equals("Update And Fax") || submission.equals("Submit And Fax")) {
!          request.setAttribute("reqId", requestId);
!          return mapping.findForward("fax");
!       } else {
!          ParameterActionForward forward = new ParameterActionForward(mapping.findForward("success"));
!          forward.addParameter("de", demographicNo);
!          return forward;
!       }
!    }
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/administration TeleplanCorrectionActionWCB.java,1.3,1.4

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/administration
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17503

Modified Files:
	TeleplanCorrectionActionWCB.java 
Log Message:
Change method perform to execute



Index: TeleplanCorrectionActionWCB.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/administration/TeleplanCorrectionActionWCB.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TeleplanCorrectionActionWCB.java	1 Oct 2004 04:42:08 -0000	1.3
--- TeleplanCorrectionActionWCB.java	28 Dec 2004 16:38:16 -0000	1.4
***************
*** 39,44 ****
   * www.andromedia.ca
   */
! public class TeleplanCorrectionActionWCB
! extends org.apache.struts.action.Action {
     private static final String sql_biling = "update_wcb_billing", //set it to be billed again in billing
     sql_billingmaster = "update_wcb_billingmaster", // set it to be billed again in billingmaster
--- 39,43 ----
   * www.andromedia.ca
   */
! public class TeleplanCorrectionActionWCB extends org.apache.struts.action.Action {
     private static final String sql_biling = "update_wcb_billing", //set it to be billed again in billing
     sql_billingmaster = "update_wcb_billingmaster", // set it to be billed again in billingmaster
***************
*** 48,52 ****
     CLOSE_RECONCILIATION = "close_reconciliation"; //closes c12 record
     
!    public ActionForward perform(ActionMapping mapping,ActionForm form,HttpServletRequest request,HttpServletResponse response)
     throws IOException, ServletException {
        
--- 47,51 ----
     CLOSE_RECONCILIATION = "close_reconciliation"; //closes c12 record
     
!    public ActionForward execute(ActionMapping mapping,ActionForm form,HttpServletRequest request,HttpServletResponse response)
     throws IOException, ServletException {
        

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/config/pageUtil MsgMessengerCreateGroupAction.java,1.4,1.5

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/config/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17232

Modified Files:
	MsgMessengerCreateGroupAction.java 
Log Message:
Change method perform to execute



Index: MsgMessengerCreateGroupAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/config/pageUtil/MsgMessengerCreateGroupAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MsgMessengerCreateGroupAction.java	10 Mar 2004 15:57:15 -0000	1.4
--- MsgMessengerCreateGroupAction.java	28 Dec 2004 16:36:56 -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 
***************
*** 48,52 ****
  public class MsgMessengerCreateGroupAction extends Action {
  
!     public ActionForward perform(ActionMapping mapping,
  				 ActionForm form,
  				 HttpServletRequest request,
--- 48,52 ----
  public class MsgMessengerCreateGroupAction extends Action {
  
!     public ActionForward execute(ActionMapping mapping,
  				 ActionForm form,
  				 HttpServletRequest request,

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil EctIncomingConsultationAction.java,1.5,1.6

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17053

Modified Files:
	EctIncomingConsultationAction.java 
Log Message:
Change method perform to execute



Index: EctIncomingConsultationAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctIncomingConsultationAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EctIncomingConsultationAction.java	9 Aug 2004 20:23:42 -0000	1.5
--- EctIncomingConsultationAction.java	28 Dec 2004 16:35:53 -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
  // *
  // -----------------------------------------------------------------------------------------------------------------------
***************
*** 32,42 ****
  
  public class EctIncomingConsultationAction extends Action {
! 
!     public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!         throws ServletException, IOException
!     {
!         EctIncomingConsultationForm frm = (EctIncomingConsultationForm)form;
!         String providerNo = frm.getProviderNo();
!         String demographicNo = frm.getDemographicNo();
          /*EctSessionBean bean = new EctSessionBean();
          bean.providerNo = providerNo;
--- 32,41 ----
  
  public class EctIncomingConsultationAction extends Action {
!    
!    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!    throws ServletException, IOException {
!       EctIncomingConsultationForm frm = (EctIncomingConsultationForm)form;
!       String providerNo = frm.getProviderNo();
!       String demographicNo = frm.getDemographicNo();
          /*EctSessionBean bean = new EctSessionBean();
          bean.providerNo = providerNo;
***************
*** 46,50 ****
              request.getSession().setAttribute("EctSessionBean", bean);
          }*/
!         return mapping.findForward("success");
!     }
  }
--- 45,49 ----
              request.getSession().setAttribute("EctSessionBean", bean);
          }*/
!       return mapping.findForward("success");
!    }
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil EctConShowAllServicesAction.java,1.3,1.4

[Jay G. <jay...@us...>]

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-serv16471

Modified Files:
	EctConShowAllServicesAction.java 
Log Message:
Change method perform to execute



Index: EctConShowAllServicesAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConShowAllServicesAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EctConShowAllServicesAction.java	11 Sep 2003 20:53:39 -0000	1.3
--- EctConShowAllServicesAction.java	28 Dec 2004 16:33:44 -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 University
! // * Hamilton
! // * Ontario, Canada
  // *
  // -----------------------------------------------------------------------------------------------------------------------
***************
*** 33,50 ****
  import org.apache.struts.action.*;
  
! public class EctConShowAllServicesAction extends Action
! {
! 
!     public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!         throws ServletException, IOException
!     {
!         EctConShowAllServicesForm showAllServicesForm = (EctConShowAllServicesForm)form;
!         String serviceId = showAllServicesForm.getServiceId();
!         String serviceDesc = showAllServicesForm.getServiceDesc();
!         //System.out.println("service id = ".concat(String.valueOf(String.valueOf(serviceId))));
!         //System.out.println("service desc = ".concat(String.valueOf(String.valueOf(serviceDesc))));
!         request.setAttribute("serviceId", serviceId);
!         request.setAttribute("serviceDesc", serviceDesc);
!         return mapping.findForward("success");
!     }
  }
--- 33,48 ----
  import org.apache.struts.action.*;
  
! public class EctConShowAllServicesAction extends Action {
!    
!    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!    throws ServletException, IOException {
!       EctConShowAllServicesForm showAllServicesForm = (EctConShowAllServicesForm)form;
!       String serviceId = showAllServicesForm.getServiceId();
!       String serviceDesc = showAllServicesForm.getServiceDesc();
!       //System.out.println("service id = ".concat(String.valueOf(String.valueOf(serviceId))));
!       //System.out.println("service desc = ".concat(String.valueOf(String.valueOf(serviceDesc))));
!       request.setAttribute("serviceId", serviceId);
!       request.setAttribute("serviceDesc", serviceDesc);
!       return mapping.findForward("success");
!    }
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil RxDeleteRxAction.java,1.1,1.2

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15982

Modified Files:
	RxDeleteRxAction.java 
Log Message:
Change method perform to execute 

Change MessageResources constructor



Index: RxDeleteRxAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxDeleteRxAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RxDeleteRxAction.java	5 Feb 2004 19:53:10 -0000	1.1
--- RxDeleteRxAction.java	28 Dec 2004 16:31:05 -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,
***************
*** 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

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarSurveillance SurveillanceAnswerAction.java,1.1,1.2

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarSurveillance
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15604

Modified Files:
	SurveillanceAnswerAction.java 
Log Message:
Change method perform to execute



Index: SurveillanceAnswerAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarSurveillance/SurveillanceAnswerAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SurveillanceAnswerAction.java	2 Oct 2004 22:18:21 -0000	1.1
--- SurveillanceAnswerAction.java	28 Dec 2004 16:29:36 -0000	1.2
***************
*** 47,51 ****
     }
     
!    public ActionForward perform(ActionMapping mapping,
  				ActionForm form,
  				HttpServletRequest request,
--- 47,51 ----
     }
     
!    public ActionForward execute(ActionMapping mapping,
  				ActionForm form,
  				HttpServletRequest request,

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/pageUtil EctImmInitConfigAction.java,1.5,1.6

[Jay G. <jay...@us...>]

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-serv15388

Modified Files:
	EctImmInitConfigAction.java 
Log Message:
Change method perform to execute



Index: EctImmInitConfigAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/pageUtil/EctImmInitConfigAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EctImmInitConfigAction.java	21 Jul 2004 14:58:59 -0000	1.5
--- EctImmInitConfigAction.java	28 Dec 2004 16:28:13 -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;
***************
*** 32,45 ****
  import org.apache.struts.util.MessageResources;
  
! public final class EctImmInitConfigAction extends Action
! {
! 
!     public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!         throws ServletException, IOException
!     {
!         Locale locale = getLocale(request);
!         MessageResources messages = getResources(request);
!         ActionErrors errors = new ActionErrors();
!         return mapping.findForward("success");
!     }
  }
--- 32,43 ----
  import org.apache.struts.util.MessageResources;
  
! public final class EctImmInitConfigAction extends Action {
!    
!    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!    throws ServletException, IOException {
!       Locale locale = getLocale(request);
!       MessageResources messages = getResources(request);
!       ActionErrors errors = new ActionErrors();
!       return mapping.findForward("success");
!    }
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil ReportReassignAction.java,1.2,1.3

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14968

Modified Files:
	ReportReassignAction.java 
Log Message:
Change method perform to execute



Index: ReportReassignAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil/ReportReassignAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ReportReassignAction.java	21 Jul 2004 15:15:30 -0000	1.2
--- ReportReassignAction.java	28 Dec 2004 16:25:23 -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,72 ****
  import oscar.oscarMDS.data.MDSResultsData;
  
! public class ReportReassignAction extends Action
! {
! 
!     public ReportReassignAction()
!     {
!     }
! 
!     public ActionForward perform(ActionMapping mapping, 
!                                  ActionForm form, 
!                                  HttpServletRequest request, 
!                                  HttpServletResponse response)
!         throws ServletException, IOException
!     {                        
!         
!         String providerNo = request.getParameter("providerNo");
!         String searchProviderNo = request.getParameter("searchProviderNo");        
!         String status = request.getParameter("status");
!                 
!         String[] flaggedLabs = request.getParameterValues("flaggedLabs"); 
!         String selectedProviders = request.getParameter("selectedProviders");
!         
!         String newURL = "";
!         
!         try {
!             MDSResultsData.updateLabRouting(flaggedLabs, selectedProviders);
!             newURL = mapping.findForward("success").getPath();
!             newURL = newURL + "?providerNo="+providerNo+"&searchProviderNo="+searchProviderNo+"&status="+status;
!             if (request.getParameter("lname") != null) { newURL = newURL + "&lname="+request.getParameter("lname"); }
!             if (request.getParameter("fname") != null) { newURL = newURL + "&fname="+request.getParameter("fname"); }
!             if (request.getParameter("hnum") != null) { newURL = newURL + "&hnum="+request.getParameter("hnum"); }            
!         } 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,69 ----
  import oscar.oscarMDS.data.MDSResultsData;
  
! public class ReportReassignAction extends Action {
!    
!    public ReportReassignAction() {
!    }
!    
!    public ActionForward execute(ActionMapping mapping,
!    ActionForm form,
!    HttpServletRequest request,
!    HttpServletResponse response)
!    throws ServletException, IOException {
!       
!       String providerNo = request.getParameter("providerNo");
!       String searchProviderNo = request.getParameter("searchProviderNo");
!       String status = request.getParameter("status");
!       
!       String[] flaggedLabs = request.getParameterValues("flaggedLabs");
!       String selectedProviders = request.getParameter("selectedProviders");
!       
!       String newURL = "";
!       
!       try {
!          MDSResultsData.updateLabRouting(flaggedLabs, selectedProviders);
!          newURL = mapping.findForward("success").getPath();
!          newURL = newURL + "?providerNo="+providerNo+"&searchProviderNo="+searchProviderNo+"&status="+status;
!          if (request.getParameter("lname") != null) { newURL = newURL + "&lname="+request.getParameter("lname"); }
!          if (request.getParameter("fname") != null) { newURL = newURL + "&fname="+request.getParameter("fname"); }
!          if (request.getParameter("hnum") != null) { newURL = newURL + "&hnum="+request.getParameter("hnum"); }
!       } 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

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil MsgWriteToEncounterAction.java,1.4,1.5

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14395

Modified Files:
	MsgWriteToEncounterAction.java 
Log Message:
Change method perform to execute



Index: MsgWriteToEncounterAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgWriteToEncounterAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MsgWriteToEncounterAction.java	19 Aug 2004 20:46:51 -0000	1.4
--- MsgWriteToEncounterAction.java	28 Dec 2004 16:22:39 -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 
***************
*** 47,51 ****
  
  
!     public ActionForward perform(ActionMapping mapping,
  				 ActionForm form,
  				 HttpServletRequest request,
--- 47,51 ----
  
  
!     public ActionForward execute(ActionMapping mapping,
  				 ActionForm form,
  				 HttpServletRequest request,

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil EctImmSaveConfigAction.java,1.5,1.6

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14125

Modified Files:
	EctImmSaveConfigAction.java 
Log Message:
Change method perform to execute



Index: EctImmSaveConfigAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil/EctImmSaveConfigAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EctImmSaveConfigAction.java	25 Nov 2004 05:35:51 -0000	1.5
--- EctImmSaveConfigAction.java	28 Dec 2004 16:21:20 -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
***************
*** 50,54 ****
  public final class EctImmSaveConfigAction extends Action {
     
!    public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
     throws ServletException, IOException {
        //System.out.println("Save Config Action Jackson");
--- 50,54 ----
  public final class EctImmSaveConfigAction extends Action {
     
!    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
     throws ServletException, IOException {
        //System.out.println("Save Config Action Jackson");

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/pageUtil EctImmCreateImmunizationSetInitAction.java,1.3,1.4

[Jay G. <jay...@us...>]

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-serv13793

Modified Files:
	EctImmCreateImmunizationSetInitAction.java 
Log Message:
Change method perform to execute



Index: EctImmCreateImmunizationSetInitAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/pageUtil/EctImmCreateImmunizationSetInitAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EctImmCreateImmunizationSetInitAction.java	11 Sep 2003 20:53:40 -0000	1.3
--- EctImmCreateImmunizationSetInitAction.java	28 Dec 2004 16:19:58 -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 University
! // * Hamilton
! // * Ontario, Canada
  // *
  // -----------------------------------------------------------------------------------------------------------------------
***************
*** 32,51 ****
  import org.apache.struts.action.*;
  
! public class EctImmCreateImmunizationSetInitAction extends Action
! {
! 
!     public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!         throws ServletException, IOException
!     {
!         EctImmCreateImmunizationSetInitForm frm = (EctImmCreateImmunizationSetInitForm)form;
!         String numCols = frm.getNumCols();
!         String numRows = frm.getNumRows();
!         String setName = frm.getSetName();
!         numCols = numCols.trim();
!         numRows = numRows.trim();
!         request.setAttribute("cols", numCols);
!         request.setAttribute("rows", numRows);
!         request.setAttribute("name", setName);
!         return mapping.findForward("success");
!     }
  }
--- 32,49 ----
  import org.apache.struts.action.*;
  
! public class EctImmCreateImmunizationSetInitAction extends Action {
!    
!    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!    throws ServletException, IOException {
!       EctImmCreateImmunizationSetInitForm frm = (EctImmCreateImmunizationSetInitForm)form;
!       String numCols = frm.getNumCols();
!       String numRows = frm.getNumRows();
!       String setName = frm.getSetName();
!       numCols = numCols.trim();
!       numRows = numRows.trim();
!       request.setAttribute("cols", numCols);
!       request.setAttribute("rows", numRows);
!       request.setAttribute("name", setName);
!       return mapping.findForward("success");
!    }
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil MsgProceedAction.java,1.5,1.6

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13365

Modified Files:
	MsgProceedAction.java 
Log Message:
Change method perform to execute



Index: MsgProceedAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgProceedAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MsgProceedAction.java	10 Mar 2004 15:57:15 -0000	1.5
--- MsgProceedAction.java	28 Dec 2004 16:17:57 -0000	1.6
***************
*** 47,51 ****
  public class MsgProceedAction extends Action {
  
!  public ActionForward perform(ActionMapping mapping,
  				 ActionForm form,
  				 HttpServletRequest request,
--- 47,51 ----
  public class MsgProceedAction extends Action {
  
!  public ActionForward execute(ActionMapping mapping,
  				 ActionForm form,
  				 HttpServletRequest request,

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/pageUtil EctImmImmunizationSetDisplayAction.java,1.3,1.4

[Jay G. <jay...@us...>]

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-serv13276

Modified Files:
	EctImmImmunizationSetDisplayAction.java 
Log Message:
Change method perform to execute



Index: EctImmImmunizationSetDisplayAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/pageUtil/EctImmImmunizationSetDisplayAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EctImmImmunizationSetDisplayAction.java	11 Sep 2003 20:53:40 -0000	1.3
--- EctImmImmunizationSetDisplayAction.java	28 Dec 2004 16:17:15 -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
  // *
  // -----------------------------------------------------------------------------------------------------------------------
***************
*** 33,47 ****
  import org.apache.struts.action.*;
  
! public class EctImmImmunizationSetDisplayAction extends Action
! {
! 
!     public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!         throws ServletException, IOException
!     {
!         EctImmImmunizationSetDisplayForm frm = (EctImmImmunizationSetDisplayForm)form;
!         String setId = frm.getSetId();
!         request.setAttribute("setId", setId);
! 
!         return mapping.findForward("success");
!     }
  }
--- 33,45 ----
  import org.apache.struts.action.*;
  
! public class EctImmImmunizationSetDisplayAction extends Action {
!    
!    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!    throws ServletException, IOException {
!       EctImmImmunizationSetDisplayForm frm = (EctImmImmunizationSetDisplayForm)form;
!       String setId = frm.getSetId();
!       request.setAttribute("setId", setId);
!       
!       return mapping.findForward("success");
!    }
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/study FrmStudyAction.java,1.3,1.4

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/study
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13046

Modified Files:
	FrmStudyAction.java 
Log Message:
Change method perform to execute



Index: FrmStudyAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/study/FrmStudyAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FrmStudyAction.java	21 Jul 2004 14:43:29 -0000	1.3
--- FrmStudyAction.java	28 Dec 2004 16:16:04 -0000	1.4
***************
*** 36,40 ****
  
  public final class FrmStudyAction extends Action {
!     public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
          throws ServletException, IOException   {
          int newID = 0;
--- 36,40 ----
  
  public final class FrmStudyAction extends Action {
!     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
          throws ServletException, IOException   {
          int newID = 0;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil BillingEditCodeAction.java,1.1,1.2

[Jay G. <jay...@us...>]

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-serv12693

Modified Files:
	BillingEditCodeAction.java 
Log Message:
Change method perform to execute



Index: BillingEditCodeAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil/BillingEditCodeAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BillingEditCodeAction.java	18 Aug 2004 04:28:20 -0000	1.1
--- BillingEditCodeAction.java	28 Dec 2004 16:14:40 -0000	1.2
***************
*** 44,48 ****
  public final class BillingEditCodeAction extends Action {
      
!     public ActionForward perform(ActionMapping mapping,
      ActionForm form,
      HttpServletRequest request,
--- 44,48 ----
  public final class BillingEditCodeAction extends Action {
      
!     public ActionForward execute(ActionMapping mapping,
      ActionForm form,
      HttpServletRequest request,

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil EctImmDeleteImmScheduleAction.java,1.1,1.2

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2679

Modified Files:
	EctImmDeleteImmScheduleAction.java 
Log Message:
Changed method from perform to execute



Index: EctImmDeleteImmScheduleAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/pageUtil/EctImmDeleteImmScheduleAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EctImmDeleteImmScheduleAction.java	25 Nov 2004 05:56:09 -0000	1.1
--- EctImmDeleteImmScheduleAction.java	27 Dec 2004 02:17:32 -0000	1.2
***************
*** 50,54 ****
     }
     
!    public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
          throws ServletException, IOException{
        
--- 50,54 ----
     }
     
!    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
          throws ServletException, IOException{
        

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil EctConAddServiceAction.java,1.3,1.4

[Jay G. <jay...@us...>]

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-serv23543

Modified Files:
	EctConAddServiceAction.java 
Log Message:
Changed method from perform to execute



Index: EctConAddServiceAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConAddServiceAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EctConAddServiceAction.java	21 Jul 2004 15:00:48 -0000	1.3
--- EctConAddServiceAction.java	24 Dec 2004 03:33:12 -0000	1.4
***************
*** 38,42 ****
  {
  
!     public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
          throws ServletException, IOException
      {
--- 38,42 ----
  {
  
!     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
          throws ServletException, IOException
      {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/pageUtil BillingCreateBillingAction.java,1.4,1.5

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23367

Modified Files:
	BillingCreateBillingAction.java 
Log Message:
Changed method from perform to execute



Index: BillingCreateBillingAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/pageUtil/BillingCreateBillingAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BillingCreateBillingAction.java	21 Jul 2004 14:51:44 -0000	1.4
--- BillingCreateBillingAction.java	24 Dec 2004 03:32:15 -0000	1.5
***************
*** 46,50 ****
      
      
!     public ActionForward perform(ActionMapping mapping,
      ActionForm form,
      HttpServletRequest request,
--- 46,50 ----
      
      
!     public ActionForward execute(ActionMapping mapping,
      ActionForm form,
      HttpServletRequest request,

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarProvider/pageUtil ProEditSignatureAction.java,1.3,1.4

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarProvider/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22910

Modified Files:
	ProEditSignatureAction.java 
Log Message:
Changed method from perform to execute



Index: ProEditSignatureAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarProvider/pageUtil/ProEditSignatureAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ProEditSignatureAction.java	21 Jul 2004 15:17:18 -0000	1.3
--- ProEditSignatureAction.java	24 Dec 2004 03:29:34 -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 
***************
*** 37,41 ****
  public class ProEditSignatureAction extends Action {
  
!     public ActionForward perform(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
          throws ServletException, IOException
      {
--- 37,41 ----
  public class ProEditSignatureAction extends Action {
  
!     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
          throws ServletException, IOException
      {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil ReportStatusUpdateAction.java,1.2,1.3

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22692

Modified Files:
	ReportStatusUpdateAction.java 
Log Message:
Changed method from perform to execute



Index: ReportStatusUpdateAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/pageUtil/ReportStatusUpdateAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ReportStatusUpdateAction.java	21 Jul 2004 15:15:30 -0000	1.2
--- ReportStatusUpdateAction.java	24 Dec 2004 03:28:08 -0000	1.3
***************
*** 41,45 ****
      }
  
!     public ActionForward perform(ActionMapping mapping, 
                                   ActionForm form, 
                                   HttpServletRequest request, 
--- 41,45 ----
      }
  
!     public ActionForward execute(ActionMapping mapping, 
                                   ActionForm form, 
                                   HttpServletRequest request, 

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/controler ConsultaFaturamentoPacienteAction.java,1.2,1.3

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/controler
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22501

Modified Files:
	ConsultaFaturamentoPacienteAction.java 
Log Message:
Changed method from perform to execute



Index: ConsultaFaturamentoPacienteAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/controler/ConsultaFaturamentoPacienteAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConsultaFaturamentoPacienteAction.java	21 Jul 2004 14:09:15 -0000	1.2
--- ConsultaFaturamentoPacienteAction.java	24 Dec 2004 03:27:12 -0000	1.3
***************
*** 40,44 ****
      static Category cat = Category.getInstance(ConsultaFaturamentoPacienteAction.class.getName());
  
!     public ActionForward perform(ActionMapping mapping, ActionForm form,
          HttpServletRequest request, HttpServletResponse response) {
          ActionForward myforward = null;
--- 40,44 ----
      static Category cat = Category.getInstance(ConsultaFaturamentoPacienteAction.class.getName());
  
!     public ActionForward execute(ActionMapping mapping, ActionForm form,
          HttpServletRequest request, HttpServletResponse response) {
          ActionForward myforward = null;