[Tolven-cvs-commit] tolvenWEB/web/drilldown encounterDD.xhtml, 1.8, 1.8.12.1

[Anil K. <aku...@us...>]

Update of /cvsroot/tolven/tolvenWEB/web/drilldown
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31650/web/drilldown

Modified Files:
      Tag: BUG_2466821_AK
	encounterDD.xhtml 
Log Message:
Fix Encounter Issue.

Index: encounterDD.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/drilldown/encounterDD.xhtml,v
retrieving revision 1.8
retrieving revision 1.8.12.1
diff -C2 -d -r1.8 -r1.8.12.1
*** encounterDD.xhtml	3 Dec 2008 06:12:02 -0000	1.8
--- encounterDD.xhtml	31 Dec 2008 19:12:54 -0000	1.8.12.1
***************
*** 25,29 ****
  				</c:if>
  				<c:if test="#{trim.trim.act.effectiveTime.IVLTS==null}">
! 					<h:outputText value="#{trim.trim.act.effectiveTime.TS.label.value}: "/>
  					<trim:TS value="#{trim.trim.act.effectiveTime.TS}" dateStyle="short" timeStyle="short" readonly="true"/>
  				</c:if>
--- 25,29 ----
  				</c:if>
  				<c:if test="#{trim.trim.act.effectiveTime.IVLTS==null}">
! 					<h:outputText value="#{act.effectiveTime.TS.label.value}: "/>
  					<trim:TS value="#{trim.trim.act.effectiveTime.TS}" dateStyle="short" timeStyle="short" readonly="true"/>
  				</c:if>
***************
*** 35,43 ****
  			    <c:if test="#{trim.trim.act.participation['attender']!=null}">
  			    	<h:outputText value="Attending physician: "/>
! 	            	<h:outputText value="#{trim.trim.act.participation['attender'].role.player.name.EN['L'].formattedParts['GIV FAM']}"/>
  		    	</c:if>
  	            <c:if test="#{trim.trim.act.participation['location']!=null}">
  	            	<h:outputText value="Location: "/>
! 	            	<h:outputText value="#{trim.trim.act.participation['location'].role.player.name.EN['L'].formattedParts['GIV FAM']}"/>
  	    		</c:if>
  
--- 35,43 ----
  			    <c:if test="#{trim.trim.act.participation['attender']!=null}">
  			    	<h:outputText value="Attending physician: "/>
! 	            	<h:outputText value="#{trim.trim.act.participation['attender'].role.player.name.EN['L'].formatted}"/>
  		    	</c:if>
  	            <c:if test="#{trim.trim.act.participation['location']!=null}">
  	            	<h:outputText value="Location: "/>
! 	            	<h:outputText value="#{trim.trim.act.participation['location'].role.player.name.EN['L'].formatted}"/>
  	    		</c:if>