oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql oscardata.sql, 1.108, 1.109

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv19940/database/mysql

Modified Files:
	oscardata.sql 
Log Message:
changed default 0 to 3 for form size for oscardoc

Index: oscardata.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscardata.sql,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** oscardata.sql	30 Nov 2010 08:17:55 -0000	1.108
--- oscardata.sql	15 Dec 2010 01:16:13 -0000	1.109
***************
*** 1032,1036 ****
  
  
! insert into ProviderPreference (providerNo, startHour, endHour, everyMin, myGroupNo, colourTemplate, defaultCaisiPmm, defaultNewOscarCme, printQrCodeOnPrescriptions, lastUpdated) values ('999998','8','18','15','.default','deepblue','disabled','disabled', 0, now());
  
  --
--- 1032,1036 ----
  
  
! insert into ProviderPreference (providerNo, startHour, endHour, everyMin, myGroupNo, colourTemplate, defaultCaisiPmm, defaultNewOscarCme, printQrCodeOnPrescriptions, lastUpdated, appointmentScreenFormNameDisplayLength) values ('999998','8','18','15','.default','deepblue','disabled','disabled', 0, now(), 3);
  
  --

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil EctDisplayDiagramAction.java, 1.1, 1.2 EctDisplayEFormAction.java, 1.25, 1.26

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29686/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil

Modified Files:
	EctDisplayDiagramAction.java EctDisplayEFormAction.java 
Log Message:
fix build errors

Index: EctDisplayEFormAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctDisplayEFormAction.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** EctDisplayEFormAction.java	11 Nov 2010 01:35:11 -0000	1.25
--- EctDisplayEFormAction.java	14 Dec 2010 23:40:41 -0000	1.26
***************
*** 28,31 ****
--- 28,32 ----
  import java.util.ArrayList;
  import java.util.Collections;
+ import java.util.HashMap;
  import java.util.Hashtable;
  import java.util.List;
***************
*** 80,89 ****
  	        StringBuilder javascript = new StringBuilder("<script type=\"text/javascript\">");        
  	        String js = ""; 
! 	        ArrayList<Hashtable<String,Object>> eForms = EFormUtil.listEForms(EFormUtil.NAME, EFormUtil.CURRENT, roleName);
  	        String key;
  	        int hash;
  	        String BGCOLOUR = request.getParameter("hC");
  	        for( int i = 0; i < eForms.size(); ++i ) {
! 	            Hashtable<String,Object> curform = eForms.get(i);
  	            winName = (String)curform.get("formName") + bean.demographicNo;            
  	            hash = Math.abs(winName.hashCode());
--- 81,90 ----
  	        StringBuilder javascript = new StringBuilder("<script type=\"text/javascript\">");        
  	        String js = ""; 
! 	        ArrayList<HashMap<String, ? extends Object>> eForms = EFormUtil.listEForms(EFormUtil.NAME, EFormUtil.CURRENT, roleName);
  	        String key;
  	        int hash;
  	        String BGCOLOUR = request.getParameter("hC");
  	        for( int i = 0; i < eForms.size(); ++i ) {
! 	        	HashMap<String, ? extends Object> curform = eForms.get(i);
  	            winName = (String)curform.get("formName") + bean.demographicNo;            
  	            hash = Math.abs(winName.hashCode());

Index: EctDisplayDiagramAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctDisplayDiagramAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EctDisplayDiagramAction.java	14 Dec 2010 21:48:55 -0000	1.1
--- EctDisplayDiagramAction.java	14 Dec 2010 23:40:41 -0000	1.2
***************
*** 29,33 ****
  import java.util.ArrayList;
  import java.util.Date;
! import java.util.Hashtable;
  
  import javax.servlet.http.HttpServletRequest;
--- 29,33 ----
  import java.util.ArrayList;
  import java.util.Date;
! import java.util.HashMap;
  
  import javax.servlet.http.HttpServletRequest;
***************
*** 63,69 ****
          winName = "AllDiagrams" + bean.demographicNo;
                
!         ArrayList eforms = EFormUtil.listEForms("eform_groups.group_name", "current", "Eye Form", null);
          for(int x=0;x<eforms.size();x++) {
!         	Hashtable ht = (Hashtable)eforms.get(x);
          	//url = "popupPage(700,1000, '" + winName + "','" + request.getContextPath() + "/eform/efmformadd_data.jsp?fid=" + ht.get("fid") +"&demographic_no=" + bean.demographicNo + "&appointment=" + appointmentNo + "')";
          	url = "popupPage(700,1000,'"+winName+"', '"+ request.getContextPath() +"/eform/efmformadd_data.jsp?fid="+ht.get("fid")+"&demographic_no=" + bean.demographicNo + "&appointment=" + appointmentNo+"')";        	               	
--- 63,69 ----
          winName = "AllDiagrams" + bean.demographicNo;
                
!         ArrayList<HashMap<String, ? extends Object>> eforms = EFormUtil.listEForms("eform_groups.group_name", "current", "Eye Form", null);
          for(int x=0;x<eforms.size();x++) {
!         	HashMap<String, ? extends Object> ht = eforms.get(x);
          	//url = "popupPage(700,1000, '" + winName + "','" + request.getContextPath() + "/eform/efmformadd_data.jsp?fid=" + ht.get("fid") +"&demographic_no=" + bean.demographicNo + "&appointment=" + appointmentNo + "')";
          	url = "popupPage(700,1000,'"+winName+"', '"+ request.getContextPath() +"/eform/efmformadd_data.jsp?fid="+ht.get("fid")+"&demographic_no=" + bean.demographicNo + "&appointment=" + appointmentNo+"')";        	               	
***************
*** 72,79 ****
          }
          
!         ArrayList patientEforms = EFormUtil.listPatientEForms("eform_data.form_date", "current", bean.demographicNo, "Eye Form", null);
          for(int x=0;x<patientEforms.size();x++) {
          	NavBarDisplayDAO.Item item = Dao.Item();
!         	java.util.Hashtable form = (java.util.Hashtable)patientEforms.get(x);
          	String strDate = (String)form.get("formDate");
          	SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
--- 72,79 ----
          }
          
!         ArrayList<HashMap<String,? extends Object>> patientEforms = EFormUtil.listPatientEForms("eform_data.form_date", "current", bean.demographicNo, "Eye Form", null);
          for(int x=0;x<patientEforms.size();x++) {
          	NavBarDisplayDAO.Item item = Dao.Item();
!         	HashMap<String,? extends Object> form = patientEforms.get(x);
          	String strDate = (String)form.get("formDate");
          	SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/eform efmformslistadd.jsp, 1.16, 1.17

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2266/web/eform

Modified Files:
	efmformslistadd.jsp 
Log Message:
fix build error

Index: efmformslistadd.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform/efmformslistadd.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** efmformslistadd.jsp	14 Dec 2010 23:40:40 -0000	1.16
--- efmformslistadd.jsp	14 Dec 2010 23:59:07 -0000	1.17
***************
*** 160,164 ****
        
  <%
!   ArrayList<HashMap<String, ? extends Object> eForms;
    if (groupView.equals("") || groupView.equals("default")) {
        eForms = EFormUtil.listEForms(orderBy, EFormUtil.CURRENT, roleName$);
--- 160,164 ----
        
  <%
!   ArrayList<HashMap<String, ? extends Object>> eForms;
    if (groupView.equals("") || groupView.equals("default")) {
        eForms = EFormUtil.listEForms(orderBy, EFormUtil.CURRENT, roleName$);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/eform efmformmanager.jsp, 1.17, 1.18 efmpatientformlistdeleted.jsp, 1.10, 1.11 efmformmanagerdeleted.jsp, 1.8, 1.9 efmformslistadd.jsp, 1.15, 1.16 efmmanageformgroups.jsp, 1.11, 1.12 efmpatientformlist.jsp, 1.14, 1.15

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29686/web/eform

Modified Files:
	efmformmanager.jsp efmpatientformlistdeleted.jsp 
	efmformmanagerdeleted.jsp efmformslistadd.jsp 
	efmmanageformgroups.jsp efmpatientformlist.jsp 
Log Message:
fix build errors

Index: efmpatientformlist.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform/efmpatientformlist.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** efmpatientformlist.jsp	21 Oct 2010 00:39:33 -0000	1.14
--- efmpatientformlist.jsp	14 Dec 2010 23:40:40 -0000	1.15
***************
*** 186,201 ****
  					</tr>
  					<%
! 						ArrayList eForms;
! 							if (groupView.equals(""))
! 							{
! 								eForms = EFormUtil.listPatientEForms(orderBy, EFormUtil.CURRENT, demographic_no, roleName$);
! 							}
! 							else
! 							{
! 								eForms = EFormUtil.listPatientEForms(orderBy, EFormUtil.CURRENT, demographic_no, groupView, roleName$);
! 							}
! 							for (int i = 0; i < eForms.size(); i++)
! 							{
! 								Hashtable curform = (Hashtable)eForms.get(i);
  					%>
  					<tr bgcolor="<%=((i % 2) == 1)?"#F2F2F2":"white"%>">
--- 186,202 ----
  					</tr>
  					<%
! 						ArrayList<HashMap<String,? extends Object>> eForms;
! 						if (groupView.equals(""))
! 						{
! 							eForms = EFormUtil.listPatientEForms(orderBy, EFormUtil.CURRENT, demographic_no, roleName$);
! 						}
! 						else
! 						{
! 							eForms = EFormUtil.listPatientEForms(orderBy, EFormUtil.CURRENT, demographic_no, groupView, roleName$);
! 						}
! 						
! 						for (int i = 0; i < eForms.size(); i++)
! 						{
! 							HashMap<String,? extends Object> curform = eForms.get(i);
  					%>
  					<tr bgcolor="<%=((i % 2) == 1)?"#F2F2F2":"white"%>">

Index: efmformslistadd.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform/efmformslistadd.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** efmformslistadd.jsp	21 Oct 2010 00:39:33 -0000	1.15
--- efmformslistadd.jsp	14 Dec 2010 23:40:40 -0000	1.16
***************
*** 160,164 ****
        
  <%
!   ArrayList eForms;
    if (groupView.equals("") || groupView.equals("default")) {
        eForms = EFormUtil.listEForms(orderBy, EFormUtil.CURRENT, roleName$);
--- 160,164 ----
        
  <%
!   ArrayList<HashMap<String, ? extends Object> eForms;
    if (groupView.equals("") || groupView.equals("default")) {
        eForms = EFormUtil.listEForms(orderBy, EFormUtil.CURRENT, roleName$);
***************
*** 168,172 ****
    if (eForms.size() > 0) {
        for (int i=0; i<eForms.size(); i++) {
!         Hashtable curForm = (Hashtable) eForms.get(i);
  %>
        <tr bgcolor="<%= ((i%2) == 1)?"#F2F2F2":"white"%>">
--- 168,172 ----
    if (eForms.size() > 0) {
        for (int i=0; i<eForms.size(); i++) {
!     	  HashMap<String, ? extends Object> curForm = eForms.get(i);
  %>
        <tr bgcolor="<%= ((i%2) == 1)?"#F2F2F2":"white"%>">

Index: efmformmanagerdeleted.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform/efmformmanagerdeleted.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** efmformmanagerdeleted.jsp	24 Nov 2010 03:52:19 -0000	1.8
--- efmformmanagerdeleted.jsp	14 Dec 2010 23:40:40 -0000	1.9
***************
*** 159,165 ****
  	</tr>
  	<%
!   ArrayList eForms = EFormUtil.listEForms(orderBy, EFormUtil.DELETED);
    for (int i=0; i<eForms.size(); i++) {
!       Hashtable curForm = (Hashtable) eForms.get(i);
  %>
  	<tr style="background-color: <%= ((i%2) == 1)?"#F2F2F2":"white"%>;">
--- 159,165 ----
  	</tr>
  	<%
! 	ArrayList<HashMap<String, ? extends Object>> eForms = EFormUtil.listEForms(orderBy, EFormUtil.DELETED);
    for (int i=0; i<eForms.size(); i++) {
! 	  HashMap<String, ? extends Object> curForm =  eForms.get(i);
  %>
  	<tr style="background-color: <%= ((i%2) == 1)?"#F2F2F2":"white"%>;">

Index: efmpatientformlistdeleted.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform/efmpatientformlistdeleted.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** efmpatientformlistdeleted.jsp	21 Oct 2010 00:39:33 -0000	1.10
--- efmpatientformlistdeleted.jsp	14 Dec 2010 23:40:40 -0000	1.11
***************
*** 147,155 ****
  			</tr>
  			<%
!     ArrayList forms = null;
!     forms = EFormUtil.listPatientEForms(orderBy, EFormUtil.DELETED, demographic_no, null);
!     for (int i=0; i< forms.size(); i++) {
!         Hashtable curform = (Hashtable) forms.get(i);
! %>
  			<tr bgcolor="<%= ((i%2) == 1)?"#F2F2F2":"white"%>">
  				<td><a href="#"
--- 147,154 ----
  			</tr>
  			<%
! 			ArrayList<HashMap<String, ? extends Object>> forms = EFormUtil.listPatientEForms(orderBy, EFormUtil.DELETED, demographic_no, null);
! 			    for (int i=0; i< forms.size(); i++) {
! 			    	HashMap<String, ? extends Object> curform = forms.get(i);
! 			%>
  			<tr bgcolor="<%= ((i%2) == 1)?"#F2F2F2":"white"%>">
  				<td><a href="#"

Index: efmformmanager.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform/efmformmanager.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** efmformmanager.jsp	24 Nov 2010 03:52:19 -0000	1.17
--- efmformmanager.jsp	14 Dec 2010 23:40:40 -0000	1.18
***************
*** 236,242 ****
      </tr>
      <%
!   ArrayList eForms = EFormUtil.listEForms(orderBy, EFormUtil.CURRENT);
    for (int i=0; i<eForms.size(); i++) {
!       Hashtable curForm = (Hashtable) eForms.get(i);
  %>
      <tr style="background-color: <%= ((i%2) == 1)?"#F2F2F2":"white"%>;">
--- 236,242 ----
      </tr>
      <%
!     ArrayList<HashMap<String, ? extends Object>> eForms = EFormUtil.listEForms(orderBy, EFormUtil.CURRENT);
    for (int i=0; i<eForms.size(); i++) {
! 	  HashMap<String, ? extends Object> curForm = eForms.get(i);
  %>
      <tr style="background-color: <%= ((i%2) == 1)?"#F2F2F2":"white"%>;">

Index: efmmanageformgroups.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform/efmmanageformgroups.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** efmmanageformgroups.jsp	24 Nov 2010 03:52:19 -0000	1.11
--- efmmanageformgroups.jsp	14 Dec 2010 23:40:40 -0000	1.12
***************
*** 35,39 ****
  <%
    ArrayList groups = EFormUtil.getEFormGroups();
!   ArrayList forms = EFormUtil.listEForms(EFormUtil.NAME, EFormUtil.CURRENT);
    String groupView = (String) request.getParameter("group_view");
    if (groupView == null) {
--- 35,39 ----
  <%
    ArrayList groups = EFormUtil.getEFormGroups();
!   ArrayList<HashMap<String, ? extends Object>> forms = EFormUtil.listEForms(EFormUtil.NAME, EFormUtil.CURRENT);
    String groupView = (String) request.getParameter("group_view");
    if (groupView == null) {
***************
*** 152,157 ****
  						key="eform.groups.addToGroup" /></strong></td>
  					<td nowrap><html:select property="fid">
! 						<%                             for (int i=0; i<forms.size(); i++) {
!                                    Hashtable curhash = (Hashtable) forms.get(i);
  %>
  						<html:option value='<%= (String) curhash.get("fid")%>'><%= (String) curhash.get("formName")%> | <%= (String) curhash.get("formDate")%></html:option>
--- 152,158 ----
  						key="eform.groups.addToGroup" /></strong></td>
  					<td nowrap><html:select property="fid">
! 						<%                             
! 							for (int i=0; i<forms.size(); i++) {
! 							HashMap<String, ? extends Object> curhash = forms.get(i);
  %>
  						<html:option value='<%= (String) curhash.get("fid")%>'><%= (String) curhash.get("formName")%> | <%= (String) curhash.get("formDate")%></html:option>
***************
*** 222,229 ****
  	<%
    if (!groupView.equals("")) {
!       ArrayList eForms = EFormUtil.listEForms(orderBy, EFormUtil.CURRENT, groupView);
        if (eForms.size() > 0) {
          for (int i=0; i<eForms.size(); i++) {
!           Hashtable curForm = (Hashtable) eForms.get(i);
  %>
  	<tr style="background-color: <%= ((i%2) == 1)?"#F2F2F2":"white"%>;">
--- 223,230 ----
  	<%
    if (!groupView.equals("")) {
!       ArrayList<HashMap<String, ? extends Object>> eForms = EFormUtil.listEForms(orderBy, EFormUtil.CURRENT, groupView);
        if (eForms.size() > 0) {
          for (int i=0; i<eForms.size(); i++) {
!         	HashMap<String, ? extends Object> curForm = eForms.get(i);
  %>
  	<tr style="background-color: <%= ((i%2) == 1)?"#F2F2F2":"white"%>;">

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform EFormUtil.java, 1.35, 1.36

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29686/web/WEB-INF/classes/src/oscar/eform

Modified Files:
	EFormUtil.java 
Log Message:
fix build errors

Index: EFormUtil.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/EFormUtil.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** EFormUtil.java	11 Nov 2010 01:35:12 -0000	1.35
--- EFormUtil.java	14 Dec 2010 23:40:41 -0000	1.36
***************
*** 31,34 ****
--- 31,35 ----
  import java.util.Collections;
  import java.util.Date;
+ import java.util.HashMap;
  import java.util.HashSet;
  import java.util.Hashtable;
***************
*** 118,122 ****
  	}
  
! 	public static ArrayList listEForms(String sortBy, String deleted) {
  
  		// sends back a list of forms that were uploaded (those that can be added to the patient)
--- 119,123 ----
  	}
  
! 	public static ArrayList<HashMap<String, ? extends Object>> listEForms(String sortBy, String deleted) {
  
  		// sends back a list of forms that were uploaded (those that can be added to the patient)
***************
*** 130,137 ****
  		}
  		ResultSet rs = getSQL(sql);
! 		ArrayList results = new ArrayList();
  		try {
  			while (rs.next()) {
! 				Hashtable curht = new Hashtable();
  				curht.put("fid", rsGetString(rs, "fid"));
  				curht.put("formName", rsGetString(rs, "form_name"));
--- 131,138 ----
  		}
  		ResultSet rs = getSQL(sql);
! 		ArrayList<HashMap<String, ? extends Object>> results = new ArrayList<HashMap<String, ? extends Object>>();
  		try {
  			while (rs.next()) {
! 				HashMap<String, Object> curht = new HashMap<String, Object>();
  				curht.put("fid", rsGetString(rs, "fid"));
  				curht.put("formName", rsGetString(rs, "form_name"));
***************
*** 151,160 ****
  	}
  
! 	public static ArrayList<Hashtable<String, Object>> listEForms(String sortBy, String deleted, String userRoles) {
! 		ArrayList<Hashtable<String, Object>> results = new ArrayList<Hashtable<String, Object>>();
! 		ArrayList<Hashtable<String, Object>> eForms = listEForms(sortBy, deleted);
  		if (eForms.size() > 0) {
  			for (int i = 0; i < eForms.size(); i++) {
! 				Hashtable<String, Object> curForm = eForms.get(i);
  				// filter eform by role type
  				if (curForm.get("roleType") != null && !curForm.get("roleType").equals("")) {
--- 152,161 ----
  	}
  
! 	public static ArrayList<HashMap<String, ? extends Object>> listEForms(String sortBy, String deleted, String userRoles) {
! 		ArrayList<HashMap<String, ? extends Object>> results = new ArrayList<HashMap<String, ? extends Object>>();
! 		ArrayList<HashMap<String, ? extends Object>> eForms = listEForms(sortBy, deleted);
  		if (eForms.size() > 0) {
  			for (int i = 0; i < eForms.size(); i++) {
! 				HashMap<String, ? extends Object> curForm = eForms.get(i);
  				// filter eform by role type
  				if (curForm.get("roleType") != null && !curForm.get("roleType").equals("")) {
***************
*** 203,207 ****
  	}
  
! 	public static ArrayList<Hashtable<String, Object>> listPatientEForms(String sortBy, String deleted, String demographic_no, String userRoles) {
  
  		Boolean current = null;
--- 204,208 ----
  	}
  
! 	public static ArrayList<HashMap<String,? extends Object>> listPatientEForms(String sortBy, String deleted, String demographic_no, String userRoles) {
  
  		Boolean current = null;
***************
*** 215,219 ****
  		else Collections.sort(allEformDatas, EFormData.FORM_DATE_COMPARATOR);
  
! 		ArrayList<Hashtable<String, Object>> results = new ArrayList<Hashtable<String, Object>>();
  		try {
  			for (EFormData eFormData : allEformDatas) {
--- 216,220 ----
  		else Collections.sort(allEformDatas, EFormData.FORM_DATE_COMPARATOR);
  
! 		ArrayList<HashMap<String, ? extends Object>> results = new ArrayList<HashMap<String, ? extends Object>>();
  		try {
  			for (EFormData eFormData : allEformDatas) {
***************
*** 229,233 ****
  					}
  				}
! 				Hashtable<String, Object> curht = new Hashtable<String, Object>();
  				curht.put("fdid", eFormData.getId().toString());
  				curht.put("fid", eFormData.getFormId().toString());
--- 230,234 ----
  					}
  				}
! 				HashMap<String, Object> curht = new HashMap<String, Object>();
  				curht.put("fdid", eFormData.getId().toString());
  				curht.put("fid", eFormData.getFormId().toString());
***************
*** 497,501 ****
  	}
  
! 	public static ArrayList listEForms(String sortBy, String deleted, String group, String userRoles) {
  		// sends back a list of forms that were uploaded (those that can be added to the patient)
  		String sql = "";
--- 498,502 ----
  	}
  
! 	public static ArrayList<HashMap<String,? extends Object>> listEForms(String sortBy, String deleted, String group, String userRoles) {
  		// sends back a list of forms that were uploaded (those that can be added to the patient)
  		String sql = "";
***************
*** 508,515 ****
  		}
  		ResultSet rs = getSQL(sql);
! 		ArrayList results = new ArrayList();
  		try {
  			while (rs.next()) {
! 				Hashtable curht = new Hashtable();
  				curht.put("fid", rsGetString(rs, "fid"));
  				curht.put("formName", rsGetString(rs, "form_name"));
--- 509,516 ----
  		}
  		ResultSet rs = getSQL(sql);
! 		ArrayList<HashMap<String, ? extends Object>> results = new ArrayList<HashMap<String, ? extends Object>>();
  		try {
  			while (rs.next()) {
! 				HashMap<String,String> curht = new HashMap<String,String>();
  				curht.put("fid", rsGetString(rs, "fid"));
  				curht.put("formName", rsGetString(rs, "form_name"));
***************
*** 528,532 ****
  	}
  
! 	public static ArrayList listPatientEForms(String sortBy, String deleted, String demographic_no, String groupName, String userRoles) {
  		// sends back a list of forms added to the patient
  		String sql = "";
--- 529,533 ----
  	}
  
! 	public static ArrayList<HashMap<String,? extends Object>> listPatientEForms(String sortBy, String deleted, String demographic_no, String groupName, String userRoles) {
  		// sends back a list of forms added to the patient
  		String sql = "";
***************
*** 539,543 ****
  		}
  		ResultSet rs = getSQL(sql);
! 		ArrayList results = new ArrayList();
  		try {
  			while (rs.next()) {
--- 540,544 ----
  		}
  		ResultSet rs = getSQL(sql);
! 		ArrayList<HashMap<String,? extends Object>> results = new ArrayList<HashMap<String,? extends Object>>();
  		try {
  			while (rs.next()) {
***************
*** 552,556 ****
  					}
  				}
! 				Hashtable curht = new Hashtable();
  				curht.put("fdid", oscar.Misc.getString(rs, "fdid"));
  				curht.put("fid", rsGetString(rs, "fid"));
--- 553,557 ----
  					}
  				}
! 				HashMap<String,String> curht = new HashMap<String,String>();
  				curht.put("fdid", oscar.Misc.getString(rs, "fdid"));
  				curht.put("fid", rsGetString(rs, "fid"));

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web CaseManagementViewAction.java, 1.139, 1.140 NoteDisplayNonNote.java, 1.4, 1.5

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29686/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web

Modified Files:
	CaseManagementViewAction.java NoteDisplayNonNote.java 
Log Message:
fix build errors

Index: CaseManagementViewAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web/CaseManagementViewAction.java,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** CaseManagementViewAction.java	15 Nov 2010 01:27:29 -0000	1.139
--- CaseManagementViewAction.java	14 Dec 2010 23:40:41 -0000	1.140
***************
*** 759,764 ****
  		// add eforms to notes list as single line items
  		String roleName = (String) request.getSession().getAttribute("userrole") + "," + (String) request.getSession().getAttribute("user");
! 		ArrayList<Hashtable<String, Object>> eForms = EFormUtil.listPatientEForms(EFormUtil.DATE, EFormUtil.CURRENT, demoNo, roleName);
! 		for (Hashtable<String, Object> eform : eForms) {
  			notesToDisplay.add(new NoteDisplayNonNote(eform));
  		}
--- 759,764 ----
  		// add eforms to notes list as single line items
  		String roleName = (String) request.getSession().getAttribute("userrole") + "," + (String) request.getSession().getAttribute("user");
! 		ArrayList<HashMap<String, ? extends Object>> eForms = EFormUtil.listPatientEForms(EFormUtil.DATE, EFormUtil.CURRENT, demoNo, roleName);
! 		for (HashMap<String, ? extends Object> eform : eForms) {
  			notesToDisplay.add(new NoteDisplayNonNote(eform));
  		}

Index: NoteDisplayNonNote.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web/NoteDisplayNonNote.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NoteDisplayNonNote.java	23 Sep 2010 10:34:29 -0000	1.4
--- NoteDisplayNonNote.java	14 Dec 2010 23:40:41 -0000	1.5
***************
*** 3,7 ****
  import java.util.ArrayList;
  import java.util.Date;
! import java.util.Hashtable;
  
  import org.oscarehr.PMmodule.dao.ProviderDao;
--- 3,7 ----
  import java.util.ArrayList;
  import java.util.Date;
! import java.util.HashMap;
  
  import org.oscarehr.PMmodule.dao.ProviderDao;
***************
*** 28,32 ****
  	private String linkInfo;
  
! 	public NoteDisplayNonNote(Hashtable<String, Object> eform) {
  		date = (Date) eform.get("formDateAsDate");
  		note = eform.get("formName") + " : " + eform.get("formSubject");
--- 28,32 ----
  	private String linkInfo;
  
! 	public NoteDisplayNonNote(HashMap<String, ? extends Object> eform) {
  		date = (Date) eform.get("formDateAsDate");
  		note = eform.get("formName") + " : " + eform.get("formSubject");

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/provider appointmentprovideradminday.jsp, 1.201, 1.202

[Peter HC <pet...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18449

Modified Files:
	appointmentprovideradminday.jsp 
Log Message:
ID 3137488 missing i18n tag, is actually a mistyped one

Index: appointmentprovideradminday.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v
retrieving revision 1.201
retrieving revision 1.202
diff -C2 -d -r1.201 -r1.202
*** appointmentprovideradminday.jsp	30 Nov 2010 18:03:20 -0000	1.201
--- appointmentprovideradminday.jsp	14 Dec 2010 22:57:47 -0000	1.202
***************
*** 1542,1546 ****
                 <a href=# onClick='popupPage(700,1024, "../oscar/billing/procedimentoRealizado/init.do?appId=<%=appointment.get("appointment_no")%>");return false;' title="Faturamento">|FAT|</a>
               <% } else {%>
!               <a href=# onClick='popupPage(755,1200, "../billing.do?billRegion=<%=URLEncoder.encode(prov)%>&billForm=<%=URLEncoder.encode(oscarVariables.getProperty("default_view"))%>&hotclick=<%=URLEncoder.encode("")%>&appointment_no=<%=appointment.get("appointment_no")%>&demographic_name=<%=URLEncoder.encode(name)%>&status=<%=status%>&demographic_no=<%=demographic_no%>&providerview=<%=curProvider_no[nProvider]%>&user_no=<%=curUser_no%>&apptProvider_no=<%=curProvider_no[nProvider]%>&appointment_date=<%=year+"-"+month+"-"+day%>&start_time=<%=iS+":"+iSm%>&bNewForm=1");return false;' title="<bean:message key="global.billingTag"/>">|<bean:message key="provider.appointmentProviderAdminDay.btnB"/></a>
               <% } %>
  <% } else {%>
--- 1542,1546 ----
                 <a href=# onClick='popupPage(700,1024, "../oscar/billing/procedimentoRealizado/init.do?appId=<%=appointment.get("appointment_no")%>");return false;' title="Faturamento">|FAT|</a>
               <% } else {%>
!               <a href=# onClick='popupPage(755,1200, "../billing.do?billRegion=<%=URLEncoder.encode(prov)%>&billForm=<%=URLEncoder.encode(oscarVariables.getProperty("default_view"))%>&hotclick=<%=URLEncoder.encode("")%>&appointment_no=<%=appointment.get("appointment_no")%>&demographic_name=<%=URLEncoder.encode(name)%>&status=<%=status%>&demographic_no=<%=demographic_no%>&providerview=<%=curProvider_no[nProvider]%>&user_no=<%=curUser_no%>&apptProvider_no=<%=curProvider_no[nProvider]%>&appointment_date=<%=year+"-"+month+"-"+day%>&start_time=<%=iS+":"+iSm%>&bNewForm=1");return false;' title="<bean:message key="global.billingtag"/>">|<bean:message key="provider.appointmentProviderAdminDay.btnB"/></a>
               <% } %>
  <% } else {%>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/provider appointmentprovideradminday.jsp, 1.199, 1.199.2.1

[Peter HC <pet...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18264

Modified Files:
      Tag: RELEASE_10_12
	appointmentprovideradminday.jsp 
Log Message:
ID 3137488 missing i18n tag, is actually a mistyped one

Index: appointmentprovideradminday.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v
retrieving revision 1.199
retrieving revision 1.199.2.1
diff -C2 -d -r1.199 -r1.199.2.1
*** appointmentprovideradminday.jsp	24 Nov 2010 04:30:23 -0000	1.199
--- appointmentprovideradminday.jsp	14 Dec 2010 22:56:34 -0000	1.199.2.1
***************
*** 1449,1453 ****
                 <a href=# onClick='popupPage(700,1024, "../oscar/billing/procedimentoRealizado/init.do?appId=<%=appointment.get("appointment_no")%>");return false;' title="Faturamento">|FAT|</a>
               <% } else {%>
!               <a href=# onClick='popupPage(755,1200, "../billing.do?billRegion=<%=URLEncoder.encode(prov)%>&billForm=<%=URLEncoder.encode(oscarVariables.getProperty("default_view"))%>&hotclick=<%=URLEncoder.encode("")%>&appointment_no=<%=appointment.get("appointment_no")%>&demographic_name=<%=URLEncoder.encode(name)%>&status=<%=status%>&demographic_no=<%=demographic_no%>&providerview=<%=curProvider_no[nProvider]%>&user_no=<%=curUser_no%>&apptProvider_no=<%=curProvider_no[nProvider]%>&appointment_date=<%=year+"-"+month+"-"+day%>&start_time=<%=iS+":"+iSm%>&bNewForm=1");return false;' title="<bean:message key="global.billingTag"/>">|<bean:message key="provider.appointmentProviderAdminDay.btnB"/></a>
               <% } %>
  <% } else {%>
--- 1449,1453 ----
                 <a href=# onClick='popupPage(700,1024, "../oscar/billing/procedimentoRealizado/init.do?appId=<%=appointment.get("appointment_no")%>");return false;' title="Faturamento">|FAT|</a>
               <% } else {%>
!               <a href=# onClick='popupPage(755,1200, "../billing.do?billRegion=<%=URLEncoder.encode(prov)%>&billForm=<%=URLEncoder.encode(oscarVariables.getProperty("default_view"))%>&hotclick=<%=URLEncoder.encode("")%>&appointment_no=<%=appointment.get("appointment_no")%>&demographic_name=<%=URLEncoder.encode(name)%>&status=<%=status%>&demographic_no=<%=demographic_no%>&providerview=<%=curProvider_no[nProvider]%>&user_no=<%=curUser_no%>&apptProvider_no=<%=curProvider_no[nProvider]%>&appointment_date=<%=year+"-"+month+"-"+day%>&start_time=<%=iS+":"+iSm%>&bNewForm=1");return false;' title="<bean:message key="global.billingtag"/>">|<bean:message key="provider.appointmentProviderAdminDay.btnB"/></a>
               <% } %>
  <% } else {%>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model SpecsHistory.java, 1.2, 1.3

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2751/web/WEB-INF/classes/src/org/oscarehr/eyeform/model

Modified Files:
	SpecsHistory.java 
Log Message:
display specs properly


Index: SpecsHistory.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model/SpecsHistory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SpecsHistory.java	4 Nov 2010 06:25:16 -0000	1.2
--- SpecsHistory.java	14 Dec 2010 22:03:04 -0000	1.3
***************
*** 165,168 ****
  	}	
  	
! 	
  }
--- 165,176 ----
  	}	
  	
! 	private String getPrefix(String data) {
! 		if(data.startsWith("-")) return data;
! 		return "+"+data;
! 	}
! 	public String toString() {
! 		String od = getPrefix(this.getOdSph()) + getPrefix(this.getOdCyl()) + "x" + getPrefix(this.getOdAxis());
! 		String os = getPrefix(this.getOsSph()) + getPrefix(this.getOsCyl()) + "x" + getPrefix(this.getOsAxis());
! 		return od + "  " + os;
! 	}
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/eyeform specs_history_list.jsp, 1.1, 1.2

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2751/web/eyeform

Modified Files:
	specs_history_list.jsp 
Log Message:
display specs properly


Index: specs_history_list.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/specs_history_list.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** specs_history_list.jsp	3 Dec 2010 16:04:07 -0000	1.1
--- specs_history_list.jsp	14 Dec 2010 22:03:04 -0000	1.2
***************
*** 54,58 ****
  <head>
  <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
! <title>Ocular Procedures
  </title>
  <html:base />
--- 54,58 ----
  <head>
  <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
! <title>Specs History
  </title>
  <html:base />
***************
*** 109,116 ****
                                      String type      = (String) specs.get(i).getType();     
                                      String date = specs.get(i).getDateStr();
                                  %>
  					<tr>
  						<td ><%=type %></td>
! 						<td >TODO</td>
  						<td ><%=date%></td>											
  					</tr>
--- 109,117 ----
                                      String type      = (String) specs.get(i).getType();     
                                      String date = specs.get(i).getDateStr();
+                                     String formula = specs.get(i).toString();
                                  %>
  					<tr>
  						<td ><%=type %></td>
! 						<td ><%=formula %></td>
  						<td ><%=date%></td>											
  					</tr>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/lab/CA/ALL labDisplayAjax.jsp, 1.23, 1.24

[Peter HC <pet...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ALL
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32460

Modified Files:
	labDisplayAjax.jsp 
Log Message:
pasted one time too many, now fixed

Index: labDisplayAjax.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ALL/labDisplayAjax.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** labDisplayAjax.jsp	14 Dec 2010 01:45:24 -0000	1.23
--- labDisplayAjax.jsp	14 Dec 2010 21:51:39 -0000	1.24
***************
*** 96,100 ****
  
           printPDF=function(doclabid){
!             document.forms['acknowledgeForm_'+doclabid].action=oscar.OscarProperties props = oscar.OscarProperties.getInstance();"../lab/CA/ALL/PrintPDF.do";
              document.forms['acknowledgeForm_'+doclabid].submit();
          }
--- 96,100 ----
  
           printPDF=function(doclabid){
!             document.forms['acknowledgeForm_'+doclabid].action="../lab/CA/ALL/PrintPDF.do";
              document.forms['acknowledgeForm_'+doclabid].submit();
          }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/eyeform exam.jsp, 1.3, 1.4

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv31741/web/eyeform

Modified Files:
	exam.jsp 
Log Message:
EyeForm diagrams


Index: exam.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/exam.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** exam.jsp	29 Nov 2010 19:02:35 -0000	1.3
--- exam.jsp	14 Dec 2010 21:50:04 -0000	1.4
***************
*** 3,11 ****
  <%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
  
- <%
- 	oscar.OscarProperties pros = oscar.OscarProperties.getInstance();
- 	String fid = pros.getProperty("eyeform_diagram_eform");
- 
- %>
  
  <script>
--- 3,6 ----
***************
*** 222,226 ****
  <a id="save_measurements" href="">[save]</a>
  <table>
! <tr><td><span class="ge">Photos and Diagrams:</span></td></tr>
  <tr>
  <td>
--- 217,221 ----
  <a id="save_measurements" href="">[save]</a>
  <table>
! <tr><td><span class="ge">Photos:</span></td></tr>
  <tr>
  <td>
***************
*** 231,242 ****
          <div id="s_19" class="slideblock">
  	        <a href="#" onclick="window.open('<html:rewrite page="/dms/documentReport.jsp"/>?function=demographic&doctype=lab&functionid=14&curUser=<%=session.getAttribute("user")%>&mode=add&parentAjaxId=docs&appointment_no='+appointmentNo);return false;">Add Photos</a>
!         </div>
!         
!         <div class="title">
!             <a style="font-weight: bold;" href="javascript:void(0)" tabindex="31" id="a_20" onclick="alert('Not yet implemented');">Diagrams:</a>            
!         </div>
!         <div id="s_20" class="slideblock">
!             <a href="#" onclick="window.open('<html:rewrite page="/eform/efmformadd_data.jsp"/>?fid=<%=fid %>&demographic_no=<%=request.getParameter("demographic_no") %>&appointment=<%=request.getParameter("appointment_no") %>');return false;">Add Diagram</a>
!         </div>
  </div>
  </td>
--- 226,230 ----
          <div id="s_19" class="slideblock">
  	        <a href="#" onclick="window.open('<html:rewrite page="/dms/documentReport.jsp"/>?function=demographic&doctype=lab&functionid=14&curUser=<%=session.getAttribute("user")%>&mode=add&parentAjaxId=docs&appointment_no='+appointmentNo);return false;">Add Photos</a>
!         </div>              
  </div>
  </td>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/actions DisplayImageAction.java, 1.12, 1.12.2.1

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

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/actions
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv31638

Modified Files:
      Tag: RELEASE_10_12
	DisplayImageAction.java 
Log Message:
ID: 3127641   -- changed to handle js, css and html files

Index: DisplayImageAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/actions/DisplayImageAction.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** DisplayImageAction.java	22 Jul 2010 18:08:24 -0000	1.12
--- DisplayImageAction.java	14 Dec 2010 21:49:29 -0000	1.12.2.1
***************
*** 132,135 ****
--- 132,141 ----
                  }else if(extension(file.getName()).equalsIgnoreCase("gif")){ // for GIF
                      contentType = "image/gif";
+                 }else if(extension(file.getName()).equalsIgnoreCase("js")){ // for GIF
+                     contentType = "text/javascript";
+                 }else if(extension(file.getName()).equalsIgnoreCase("css")){ // for GIF
+                     contentType = "text/css";
+                 }else if(extension(file.getName()).equalsIgnoreCase("html") || extension(file.getName()).equalsIgnoreCase("htm")){ // for HTML
+                     contentType = "text/html";
                  }else{
                      throw new Exception("please check the file type or update mimetypes.default file to include the "+"."+extension(file.getName()));

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil EctDisplayDiagramAction.java, NONE, 1.1

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv31393/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil

Added Files:
	EctDisplayDiagramAction.java 
Log Message:
displaying diagrams


--- NEW FILE: EctDisplayDiagramAction.java ---
// -----------------------------------------------------------------------------------------------------------------------
// *
// *
// * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
// * This software is published under the GPL GNU General Public License. 
// * This program is free software; you can redistribute it and/or 
// * modify it under the terms of the GNU General Public License 
// * as published by the Free Software Foundation; either version 2 
// * of the License, or (at your option) any later version. * 
// * This program is distributed in the hope that it will be useful, 
// * but WITHOUT ANY WARRANTY; without even the implied warranty of 
// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
// * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License 
// * along with this program; if not, write to the Free Software 
// * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 
// * 
// * <OSCAR TEAM>
// * This software was written for the 
// * Department of Family Medicine 
// * McMaster University 
// * Hamilton 
// * Ontario, Canada 
// *
// -----------------------------------------------------------------------------------------------------------------------

package oscar.oscarEncounter.pageUtil;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.Hashtable;

import javax.servlet.http.HttpServletRequest;

import org.apache.struts.util.MessageResources;

import oscar.eform.EFormUtil;
import oscar.util.StringUtils;

//import oscar.oscarSecurity.CookieSecurity;

public class EctDisplayDiagramAction extends EctDisplayAction {
    private static final String cmd = "diagrams";
    
  public boolean getInfo(EctSessionBean bean, HttpServletRequest request, NavBarDisplayDAO Dao, MessageResources messages) {               	             

	  String appointmentNo = request.getParameter("appointment_no");
		
        //set text for lefthand module title
        Dao.setLeftHeading(messages.getMessage(request.getLocale(), "oscarEncounter.LeftNavBar.Diagrams"));
        
        //set link for lefthand module title
        String winName = "Diagrams" + bean.demographicNo;
        String url = "popupPage(700,599,'" + winName + "','" + request.getContextPath() + "/lab/DemographicLab.jsp?demographicNo=" + bean.demographicNo + "'); return false;";
       // Dao.setLeftURL(url);
        
        //we're going to display popup menu of 2 selections - row display and grid display
        String menuId = "4";
        Dao.setRightHeadingID(menuId);
        Dao.setRightURL("return !showMenu('" + menuId + "', event);");
        Dao.setMenuHeader("Ocular Diagrams");                
        
        winName = "AllDiagrams" + bean.demographicNo;
              
        ArrayList eforms = EFormUtil.listEForms("eform_groups.group_name", "current", "Eye Form", null);
        for(int x=0;x<eforms.size();x++) {
        	Hashtable ht = (Hashtable)eforms.get(x);
        	//url = "popupPage(700,1000, '" + winName + "','" + request.getContextPath() + "/eform/efmformadd_data.jsp?fid=" + ht.get("fid") +"&demographic_no=" + bean.demographicNo + "&appointment=" + appointmentNo + "')";
        	url = "popupPage(700,1000,'"+winName+"', '"+ request.getContextPath() +"/eform/efmformadd_data.jsp?fid="+ht.get("fid")+"&demographic_no=" + bean.demographicNo + "&appointment=" + appointmentNo+"')";        	               	
        	Dao.addPopUpUrl(url);
        	Dao.addPopUpText((String)ht.get("formName"));
        }
        
        ArrayList patientEforms = EFormUtil.listPatientEForms("eform_data.form_date", "current", bean.demographicNo, "Eye Form", null);
        for(int x=0;x<patientEforms.size();x++) {
        	NavBarDisplayDAO.Item item = Dao.Item();
        	java.util.Hashtable form = (java.util.Hashtable)patientEforms.get(x);
        	String strDate = (String)form.get("formDate");
        	SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
        	try {
        		item.setDate(formatter.parse(strDate));
        	}catch(Exception e) {item.setDate(new Date());}
        	
        	String itemHeader = StringUtils.maxLenString((String)form.get("formName"), MAX_LEN_TITLE, CROP_LEN_TITLE, ELLIPSES);                      
            item.setLinkTitle(itemHeader);        
            item.setTitle(itemHeader);
            int hash = Math.abs(winName.hashCode());        
            url = "popupPage(500,900,'" + hash + "','" + request.getContextPath() + "/eform/efmshowform_data.jsp?fdid="+form.get("fdid")+"&parentAjaxId=eforms" +"'); return false;";        
            item.setURL(url);               
            Dao.addItem(item);
        }

        Dao.sortItems(NavBarDisplayDAO.DATESORT);
        
        return true;  	
  }
  
  public String getCmd() {
      return cmd;
  }
}

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/js/custom eyeform-cme.js, 1.7, 1.8

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv31393/web/js/custom

Modified Files:
	eyeform-cme.js 
Log Message:
displaying diagrams


Index: eyeform-cme.js
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom/eyeform-cme.js,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** eyeform-cme.js	13 Dec 2010 19:33:23 -0000	1.7
--- eyeform-cme.js	14 Dec 2010 21:48:56 -0000	1.8
***************
*** 78,81 ****
--- 78,83 ----
         popColumn(ctx + "/oscarEncounter/displayMacro.do?hC=009999&appointment_no="+appointmentNo,"macro","macro", "leftNavBar", this);
         
+        addLeftNavDiv("diagrams");	      
+        popColumn(ctx + "/oscarEncounter/displayDiagrams.do?hC=009999&appointment_no="+appointmentNo,"diagrams","diagrams", "leftNavBar", this);
         
         removeNavDiv('issues');

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes oscarResources_en.properties, 1.360, 1.361

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv31393/web/WEB-INF/classes

Modified Files:
	oscarResources_en.properties 
Log Message:
displaying diagrams


Index: oscarResources_en.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v
retrieving revision 1.360
retrieving revision 1.361
diff -C2 -d -r1.360 -r1.361
*** oscarResources_en.properties	5 Dec 2010 16:00:47 -0000	1.360
--- oscarResources_en.properties	14 Dec 2010 21:48:55 -0000	1.361
***************
*** 800,803 ****
--- 800,805 ----
  oscarEncounter.NavBar.OtherMeds=Other Meds
  oscarEncounter.NavBar.Issues=Current Issues
+ oscarEncounter.LeftNavBar.Diagrams=Diagrams
+ oscarEncounter.LeftNavBar.DiagramsMenuHeading=Diagrams
  
  oscarEncounter.concurrencyError.title=Error Saving Encounter

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF struts-config.xml, 1.361, 1.362

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv31393/web/WEB-INF

Modified Files:
	struts-config.xml 
Log Message:
displaying diagrams


Index: struts-config.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/struts-config.xml,v
retrieving revision 1.361
retrieving revision 1.362
diff -C2 -d -r1.361 -r1.362
*** struts-config.xml	10 Dec 2010 20:38:35 -0000	1.361
--- struts-config.xml	14 Dec 2010 21:48:55 -0000	1.362
***************
*** 872,876 ****
  		<action path="/oscarEncounter/displayDecisionSupportAlerts" scope="request" type="oscar.oscarEncounter.pageUtil.EctDisplayDecisionSupportAlertsAction"></action>
  		<action path="/report/printLabDaySheetAction" type="oscar.oscarReport.pageUtil.printLabDaySheetAction"></action>
! 
  		<action path="/oscarEncounter/decisionSupport/guidelineAction" scope="request" parameter="method" type="org.springframework.web.struts.DelegatingActionProxy">
  			<forward name="guidelineList" path="/oscarEncounter/decisionSupport/guidelineList.jsp" />
--- 872,877 ----
  		<action path="/oscarEncounter/displayDecisionSupportAlerts" scope="request" type="oscar.oscarEncounter.pageUtil.EctDisplayDecisionSupportAlertsAction"></action>
  		<action path="/report/printLabDaySheetAction" type="oscar.oscarReport.pageUtil.printLabDaySheetAction"></action>
! 		<action path="/oscarEncounter/displayDiagrams" scope="request" type="oscar.oscarEncounter.pageUtil.EctDisplayDiagramAction"></action>
! 		
  		<action path="/oscarEncounter/decisionSupport/guidelineAction" scope="request" parameter="method" type="org.springframework.web.struts.DelegatingActionProxy">
  			<forward name="guidelineList" path="/oscarEncounter/decisionSupport/guidelineList.jsp" />

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/actions DisplayImageAction.java, 1.12, 1.13

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

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/actions
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv31116

Modified Files:
	DisplayImageAction.java 
Log Message:
changed to handle js, css and html files

Index: DisplayImageAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/actions/DisplayImageAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DisplayImageAction.java	22 Jul 2010 18:08:24 -0000	1.12
--- DisplayImageAction.java	14 Dec 2010 21:46:58 -0000	1.13
***************
*** 132,135 ****
--- 132,141 ----
                  }else if(extension(file.getName()).equalsIgnoreCase("gif")){ // for GIF
                      contentType = "image/gif";
+                 }else if(extension(file.getName()).equalsIgnoreCase("js")){ // for GIF
+                     contentType = "text/javascript";
+                 }else if(extension(file.getName()).equalsIgnoreCase("css")){ // for GIF
+                     contentType = "text/css";
+                 }else if(extension(file.getName()).equalsIgnoreCase("html") || extension(file.getName()).equalsIgnoreCase("htm")){ // for HTML
+                     contentType = "text/html";
                  }else{
                      throw new Exception("please check the file type or update mimetypes.default file to include the "+"."+extension(file.getName()));

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes oscarResources_pl.properties, 1.11, 1.12

[Peter HC <pet...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14263

Modified Files:
	oscarResources_pl.properties 
Log Message:
Any trunk version should be labeled as such just in case someone expects to run production data on it!

Index: oscarResources_pl.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_pl.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** oscarResources_pl.properties	12 Dec 2010 23:58:58 -0000	1.11
--- oscarResources_pl.properties	14 Dec 2010 02:09:24 -0000	1.12
***************
*** 42,47 ****
  loginApplication.gplLink2=
  loginApplication.gpltext=gpl.txt
! loginApplication.alert=OSCAR McMaster 2.1 Beta
! loginApplication.alert2=QuatroShelter v. 1.2
  
  loginApplication.image.i18n=images/PL.png
--- 42,47 ----
  loginApplication.gplLink2=
  loginApplication.gpltext=gpl.txt
! loginApplication.alert=OSCAR McMaster **niestabilnej wersji**
! loginApplication.alert2=QuatroShelter 
  
  loginApplication.image.i18n=images/PL.png

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes oscar_mcmaster.properties, 1.78, 1.79

[Peter HC <pet...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv12564

Modified Files:
	oscar_mcmaster.properties 
Log Message:
UI tweak.  If an additional click is desired for each lab result then set confirmAck=yes in oscar.properties.  Otherwise the results get acknowledged with only one click.

Index: oscar_mcmaster.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscar_mcmaster.properties,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** oscar_mcmaster.properties	6 Dec 2010 04:24:27 -0000	1.78
--- oscar_mcmaster.properties	14 Dec 2010 02:01:52 -0000	1.79
***************
*** 408,411 ****
--- 408,415 ----
  LAB_NOMATCH_NAMES=yes
  
+ ## confirmAck=yes : Acknowledged inbox documents will require confirmation dialog prior to being filed
+ ## confirmAck=no :  Acknowledged inbox documents will be filed on acknowledgement
+ #confirmAck=no
+ 
  ## TURNS ON THE NEW STYLE ECHART
  USE_NEW_ECHART=yes

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/lab/CA/ALL labDisplayAjax.jsp, 1.22, 1.23

[Peter HC <pet...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ALL
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv8911

Modified Files:
	labDisplayAjax.jsp 
Log Message:
UI tweak.  If an additional click is desired for each lab result then set acknowledgeAck=yes in oscar.properties.  Otherwise the results get acknowledged with only one click.

Index: labDisplayAjax.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ALL/labDisplayAjax.jsp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** labDisplayAjax.jsp	24 Nov 2010 03:42:49 -0000	1.22
--- labDisplayAjax.jsp	14 Dec 2010 01:45:24 -0000	1.23
***************
*** 9,13 ****
  		 oscar.oscarMDS.data.ReportStatus,oscar.log.*,
                   oscar.oscarDB.DBHandler,
! 		 org.apache.commons.codec.binary.Base64" %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
--- 9,14 ----
  		 oscar.oscarMDS.data.ReportStatus,oscar.log.*,
                   oscar.oscarDB.DBHandler,
! 		 org.apache.commons.codec.binary.Base64,
!                  oscar.OscarProperties" %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
***************
*** 17,21 ****
  <%@ taglib uri="/WEB-INF/indivo-tag.tld" prefix="indivo"%>
  <%
! 
  String segmentID = request.getParameter("segmentID");
  String providerNo = request.getParameter("providerNo");
--- 18,22 ----
  <%@ taglib uri="/WEB-INF/indivo-tag.tld" prefix="indivo"%>
  <%
! oscar.OscarProperties props = oscar.OscarProperties.getInstance();
  String segmentID = request.getParameter("segmentID");
  String providerNo = request.getParameter("providerNo");
***************
*** 95,99 ****
  
           printPDF=function(doclabid){
!             document.forms['acknowledgeForm_'+doclabid].action="../lab/CA/ALL/PrintPDF.do";
              document.forms['acknowledgeForm_'+doclabid].submit();
          }
--- 96,100 ----
  
           printPDF=function(doclabid){
!             document.forms['acknowledgeForm_'+doclabid].action=oscar.OscarProperties props = oscar.OscarProperties.getInstance();"../lab/CA/ALL/PrintPDF.do";
              document.forms['acknowledgeForm_'+doclabid].submit();
          }
***************
*** 153,159 ****
                                                              }});
          }
!         confirmAck=function() {
!             return confirm('<bean:message key="oscarMDS.index.msgConfirmAcknowledge"/>');
!         }
          confirmAckUnmatched=function(){
              return confirm('<bean:message key="oscarMDS.index.msgConfirmAcknowledgeUnmatched"/>');
--- 154,164 ----
                                                              }});
          }
!         function confirmAck(){
! 		<% if (props.getProperty("confirmAck", "").equals("yes")) { %>
!             		return confirm('<bean:message key="oscarMDS.index.msgConfirmAcknowledge"/>');
!             	<% } else { %>
!             		return true;
!             	<% } %>
! 	}
          confirmAckUnmatched=function(){
              return confirm('<bean:message key="oscarMDS.index.msgConfirmAcknowledgeUnmatched"/>');

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/lab/CA/ALL labDisplay.jsp, 1.44, 1.45

[Peter HC <pet...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ALL
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv8430

Modified Files:
	labDisplay.jsp 
Log Message:
UI tweak.  If an additional click is desired for each lab result then set acknowledgeAck=yes in oscar.properties.  Otherwise the results get acknowledged with only one click.

Index: labDisplay.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ALL/labDisplay.jsp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** labDisplay.jsp	16 Nov 2010 08:35:39 -0000	1.44
--- labDisplay.jsp	14 Dec 2010 01:45:10 -0000	1.45
***************
*** 8,12 ****
  		 oscar.oscarLab.LabRequestReportLink,
  		 oscar.oscarMDS.data.ReportStatus,oscar.log.*,
! 		 org.apache.commons.codec.binary.Base64" %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
--- 8,13 ----
  		 oscar.oscarLab.LabRequestReportLink,
  		 oscar.oscarMDS.data.ReportStatus,oscar.log.*,
! 		 org.apache.commons.codec.binary.Base64,
!                  oscar.OscarProperties" %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
***************
*** 16,20 ****
  <%@ taglib uri="/WEB-INF/indivo-tag.tld" prefix="indivo"%>
  <%
! 
  String segmentID = request.getParameter("segmentID");
  String providerNo = request.getParameter("providerNo");
--- 17,21 ----
  <%@ taglib uri="/WEB-INF/indivo-tag.tld" prefix="indivo"%>
  <%
! oscar.OscarProperties props = oscar.OscarProperties.getInstance();
  String segmentID = request.getParameter("segmentID");
  String providerNo = request.getParameter("providerNo");
***************
*** 121,125 ****
  .AbnormalRes a:active { color: red }
  .NormalRes   { font-weight: bold; font-size: 8pt; color: black; font-family: 
!                Verdana, Arial, Helvetica }
  .NormalRes a:link { color: black }
  .NormalRes a:hover { color: black }
--- 122,128 ----
  .AbnormalRes a:active { color: red }
  .NormalRes   { font-weight: bold; font-size: 8pt; color: black; font-family: 
!                       confirmAck=function() {
!             return confirm('<bean:message key="oscarMDS.index.msgConfirmAcknowledge"/>');
!         } Verdana, Arial, Helvetica }
  .NormalRes a:link { color: black }
  .NormalRes a:hover { color: black }
***************
*** 134,138 ****
  .CorrectedRes { font-weight: bold; font-size: 8pt; color: #E000D0; font-family: 
                 Verdana, Arial, Helvetica }
! .CorrectedRes a:link { color: #6da997 }
  .CorrectedRes a:hover { color: #6da997 }
  .CorrectedRes a:visited { color: #6da997 }
--- 137,143 ----
  .CorrectedRes { font-weight: bold; font-size: 8pt; color: #E000D0; font-family: 
                 Verdana, Arial, Helvetica }
! .CorrectedRes         confirmAck=function() {
!             return confirm('<bean:message key="oscarMDS.index.msgConfirmAcknowledge"/>');
!         }a:link { color: #6da997 }
  .CorrectedRes a:hover { color: #6da997 }
  .CorrectedRes a:visited { color: #6da997 }
***************
*** 148,152 ****
  div.Field2   { font-weight: bold; font-size: 8pt; color: #ffffff; font-family: 
                 Verdana, Arial, Helvetica }
! div.FieldData { font-weight: normal; font-size: 8pt; color: black; font-family: 
                 Verdana, Arial, Helvetica }
  div.Field3   { font-weight: normal; font-size: 8pt; color: black; font-style: italic; 
--- 153,159 ----
  div.Field2   { font-weight: bold; font-size: 8pt; color: #ffffff; font-family: 
                 Verdana, Arial, Helvetica }
! div.FieldData {         confirmAck=function() {
!             return confirm('<bean:message key="oscarMDS.index.msgConfirmAcknowledge"/>');
!         }font-weight: normal; font-size: 8pt; color: black; font-family:
                 Verdana, Arial, Helvetica }
  div.Field3   { font-weight: normal; font-size: 8pt; color: black; font-style: italic; 
***************
*** 175,179 ****
  .Cell3       { background-color: #add9c7; border-left: thin solid #dbfdeb; 
                 border-right: thin solid #5d9987; 
!                border-top: thin solid #dbfdeb; 
                 border-bottom: thin solid #5d9987 }
  .CellHdr     { background-color: #cbe5d7; border-right-style: none; border-right-width: 
--- 182,188 ----
  .Cell3       { background-color: #add9c7; border-left: thin solid #dbfdeb; 
                 border-right: thin solid #5d9987; 
!                       confirmAck=function() {
!             return confirm('<bean:message key="oscarMDS.index.msgConfirmAcknowledge"/>');
!         } border-top: thin solid #dbfdeb;
                 border-bottom: thin solid #5d9987 }
  .CellHdr     { background-color: #cbe5d7; border-right-style: none; border-right-width: 
***************
*** 277,283 ****
                                                              }});
          }
!         function  confirmAck() {
!             return confirm('<bean:message key="oscarMDS.index.msgConfirmAcknowledge"/>');
!         }
          function confirmAckUnmatched(){
              return confirm('<bean:message key="oscarMDS.index.msgConfirmAcknowledgeUnmatched"/>');
--- 286,296 ----
                                                              }});
          }
!         function confirmAck(){
! 		<% if (props.getProperty("confirmAck", "").equals("yes")) { %>
!             		return confirm('<bean:message key="oscarMDS.index.msgConfirmAcknowledge"/>');
!             	<% } else { %>
!             		return true;
!             	<% } %>
! 	}
          function confirmAckUnmatched(){
              return confirm('<bean:message key="oscarMDS.index.msgConfirmAcknowledgeUnmatched"/>');

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/js/custom eyeform-cme.js, 1.6, 1.7

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11242/web/js/custom

Modified Files:
	eyeform-cme.js 
Log Message:
backend for ext printing in CME


Index: eyeform-cme.js
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom/eyeform-cme.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** eyeform-cme.js	3 Dec 2010 16:04:07 -0000	1.6
--- eyeform-cme.js	13 Dec 2010 19:33:23 -0000	1.7
***************
*** 86,89 ****
--- 86,90 ----
         //popColumn(ctx + "/oscarEncounter/displayMacro.do?hC=009999&appointment_no="+appointmentNo,"OcularMeds","OcularMeds", "rightNavBar", this);
         
+        addPrintOption('Measurements','extPrintMeasurements');
         
       });

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/casemgmt newEncounterLayout.jsp, 1.57, 1.58

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11242/web/casemgmt

Modified Files:
	newEncounterLayout.jsp 
Log Message:
backend for ext printing in CME


Index: newEncounterLayout.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/newEncounterLayout.jsp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** newEncounterLayout.jsp	2 Dec 2010 04:04:31 -0000	1.57
--- newEncounterLayout.jsp	13 Dec 2010 19:33:22 -0000	1.58
***************
*** 186,191 ****
         
  
         var appointmentNo = <%=request.getParameter("appointmentNo")%>;
!               
     </script>
   
--- 186,199 ----
         
  
+        function addPrintOption(name,bean) {
+     	   var test1Str = "<img style=\"cursor: pointer;\" title=\"Print "+name+"\" id=\"img"+name+"\" alt=\"Print "+name+"\" onclick=\"return printInfo(this, 'extPrint"+name+"');\" src=\"" + ctx + "/oscarEncounter/graphics/printer.png\">&nbsp;"+name;
+            jQuery("#printDateRow").before("<tr><td></td><td>" + test1Str + "</tr></tr>");           
+            jQuery("form[name='caseManagementEntryForm']").append("<input name=\"extPrint"+name+"\" id=\"extPrint"+name+"\" value=\"false\" type=\"hidden\"/>");
+            jQuery.ajax({ url: ctx+"/casemgmt/ExtPrintRegistry.do?method=register&name="+name+"&bean="+bean, async:false, success: function(data){               
+            }});      
+        }
+        
         var appointmentNo = <%=request.getParameter("appointmentNo")%>;
!       
     </script>
   
***************
*** 619,623 ****
                <h3 style="margin-bottom:5px; text-align:center;"><bean:message key="oscarEncounter.Index.PrintDialog"/></h3>
                <form id="frmPrintOps" action="" onsubmit="return false;">
!               		<table>
                			<tr>
                				<td><input type="radio" id="printopSelected" name="printop" value="selected"><bean:message key="oscarEncounter.Index.PrintSelect"/></td>
--- 627,631 ----
                <h3 style="margin-bottom:5px; text-align:center;"><bean:message key="oscarEncounter.Index.PrintDialog"/></h3>
                <form id="frmPrintOps" action="" onsubmit="return false;">
!               		<table id="printElementsTable">
                			<tr>
                				<td><input type="radio" id="printopSelected" name="printop" value="selected"><bean:message key="oscarEncounter.Index.PrintSelect"/></td>
***************
*** 637,641 ****
                				</td>
                			</tr>
!               			<tr>
                				<td><input type="radio" id="printopDates" name="printop" value="dates"><bean:message key="oscarEncounter.Index.PrintDates"/>&nbsp;<a style="font-variant:small-caps;" href="#" onclick="return printToday(event);"><bean:message key="oscarEncounter.Index.PrintToday"/></a></td>
                				<td></td>
--- 645,650 ----
                				</td>
                			</tr>
!               			<!--  extension point -->              			
!               			<tr id="printDateRow">
                				<td><input type="radio" id="printopDates" name="printop" value="dates"><bean:message key="oscarEncounter.Index.PrintDates"/>&nbsp;<a style="font-variant:small-caps;" href="#" onclick="return printToday(event);"><bean:message key="oscarEncounter.Index.PrintToday"/></a></td>
                				<td></td>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF applicationContext.xml, 1.178, 1.179

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11242/web/WEB-INF

Modified Files:
	applicationContext.xml 
Log Message:
backend for ext printing in CME


Index: applicationContext.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/applicationContext.xml,v
retrieving revision 1.178
retrieving revision 1.179
diff -C2 -d -r1.178 -r1.179
*** applicationContext.xml	29 Nov 2010 19:02:34 -0000	1.178
--- applicationContext.xml	13 Dec 2010 19:33:22 -0000	1.179
***************
*** 320,322 ****
--- 320,325 ----
  		</property>
  	</bean>
+ 	
+ 	<bean id="extPrintMeasurements" class="org.oscarehr.casemgmt.service.MeasurementPrint" autowire="byName"/>
+ 
  </beans>