4474. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 6/9/2017 3:51:40 PM Eastern Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

4474.1 Files compared

#	Location	File	Last Modified
1			Fri Jun 9 19:51:40 2017 UTC
2	eHealth_Exch (eHealth Exchange Enhancements) Build 3 docs & code_May_2017.zip\VAP_CIF_CODE0502.zip\VAP_CIF_CODE0502\VAP_CIF_CODE0502\nvap-web\src\main\webapp\WEB-INF\web	disclosureSummaryReportResults.jsp	Fri Apr 21 20:15:58 2017 UTC

4474.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	0	0
Changed	0	0
Inserted	1	294
Removed	0	0

4474.3 Comparison options

Whitespace
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

4474.4 Active regular expressions

No regular expressions were active.

4474.5 Comparison detail

				1		<%--
				2		Docume nt : Dis closure Su mmary Repo rt
				3		--%>
				4		<%-- DEPRE CATED --%>
				5		<%--
				6		<<<<<<< HE AD
				7		<%@taglib tagdir="/W EB-INF/tag s/formatti ng" prefix ="f" %>
				8		=======
				9		<%@page co ntentType= "text/html " pageEnco ding="UTF- 8"%>
				10		>>>>>>> va pe_incr_2
				11		<%@taglib uri="http: //java.sun .com/jsp/j stl/core" prefix="c" %>
				12		<%@taglib uri="http: //java.sun .com/jsp/j stl/fmt" p refix="fmt "%>
				13		<%@taglib tagdir="/W EB-INF/tag s/paginato r" prefix= "pg"%>
				14		<%@taglib tagdir="/W EB-INF/tag s/cpp" pre fix="cpp"% >
				15
				16		<<<<<<< HE AD
				17		<f:mainTem plate head erText="Di sclosures Summary Re port">
				18		<scrip t language ="JavaScri pt">
				19		$( document). ready(func tion () {
				20		//toolti ps
				21		$('#orga nizationHe ader').qti p($.extend (tipOption s, {
				22		cont ent: "${de scriptors[ "disclosur eSummaryRe portOrgani zationColu mn"]}"
				23		}));
				24		$('#faci lityHeader ').qtip($. extend(tip Options, {
				25		cont ent: "${de scriptors[ "disclosur eReportFac ilityColum n"]}"
				26		}));
				27		$('#faci lityNumber Header').q tip($.exte nd(tipOpti ons, {
				28		cont ent: "${de scriptors[ "patientPr eferredFac ilityStati onIdColumn "]}"
				29		}));
				30		$('#tota lHeader'). qtip($.ext end(tipOpt ions, {
				31		cont ent: "${de scriptors[ "disclosur eSummaryRe portTotalC olumn"]}",
				32		posi tion: {
				33		my: 'cente r right',
				34		at: 'cente r left'
				35		}
				36		}));
				37		}) ;
				38		</scri pt>
				39		<div>
				40		<f orm>
				41		<input n ame="expor tToExcel" title="Exp ort to Exc el" class= "button" t ype="submi t" value=" Export to Excel" />
				42		</ form>
				43		</div>
				44		<table class="ve r-minimali st">
				45		<t body>
				46		<tr clas s="dateFil ters">
				47		<th scope="row " style="b order-bott om: none; float: lef t; font-si ze: 0; hei ght: 0;">D ates</th>
				48		<td class="dat ePadding"> Start Date </td>
				49		<td>
				50		<c:choose>
				51		<c:whe n test="${ !empty dis closureSum maryQueryS tartDate}" >
				52		<f mt:formatD ate patter n="MM/dd/y yyy" value ="${disclo sureSummar yQueryStar tDate}" />
				53		</c:wh en>
				54		<c:oth erwise>
				55		N/ A
				56		</c:ot herwise>
				57		</c:choose >
				58		</td >
				59		<td class="dat ePadding"> End Date</ td>
				60		<td>
				61		<c:choose>
				62		<c:whe n test="${ !empty dis closureSum maryQueryE ndDate}">
				63		<f mt:formatD ate patter n="MM/dd/y yyy" value ="${disclo sureSummar yQueryEndD ate}" />
				64		</c:wh en>
				65		<c:oth erwise>
				66		N/ A
				67		</c:ot herwise>
				68		</c:choose >
				69		</td >
				70		</tr>
				71		</ tbody>
				72		</tabl e>
				73		<c:cho ose>
				74		<c :when test ="${!empty disclosur eSummaryRe sults}">
				75		<table>
				76		<tbo dy>
				77		<tr class= "hor-minim alist-c">
				78		<c:cho ose>
				79		<c :when test ="${disclo sureSummar yQuerySour ce eq 'Exc hange'}">
				80		<th scop e="col"><s pan id="or ganization Header">${ organizati onName} Or ganization </span></t h>
				81		<th scop e="col"><s pan id="fa cilityHead er">Patien t Preferre d Facility </span></t h>
				82		<td styl e="border- bottom: no ne;"><span id="facil ityNumberH eader">Pat ient Prefe rred Facil ity Statio n ID</span ></td>
				83		</ c:when>
				84		<c :otherwise >
				85		<th scop e="col"><s pan id="or ganization Header">Di rect Endpo int</span> </th>
				86		</c:othe rwise>
				87		</ c:choose>
				88		<th sc ope="col"> <span id=" totalHeade r">Total</ span></th>
				89		</tr>
				90		<tr class= "hor-minim alist-c">
				91		<td><a href="Dis closureSum maryReport Results.do _sec?discl osureSumma rySortValu e=partnerO rg&disclos ureSummary SortDirect ion=ASC">< br><img al t="sort th is column in ascendi ng order" src="res/s ort-ascend ing.jpg" b order="0"/ ></a><a> - </a><a hr ef="Disclo sureSummar yReportRes ults.do_se c?disclosu reSummaryS ortValue=p artnerOrg& disclosure SummarySor tDirection =DESC"><im g alt="sor t this col umn in des cending or der" src=" res/sort-d escending. jpg" borde r="0"/></a ></td>
				92		<c:choos e>
				93		<c:w hen test=" ${disclosu reSummaryQ uerySource eq 'Excha nge'}">
				94		<td><a h ref="Discl osureSumma ryReportRe sults.do_s ec?disclos ureSummary SortValue= vaFacility &disclosur eSummarySo rtDirectio n=ASC"><br ><img alt= "sort this column in ascending order" sr c="res/sor t-ascendin g.jpg" bor der="0"/>< /a><a> - < /a><a href ="Disclosu reSummaryR eportResul ts.do_sec? disclosure SummarySor tValue=vaF acility&di sclosureSu mmarySortD irection=D ESC"><img alt="sort this colum n in desce nding orde r" src="re s/sort-des cending.jp g" border= "0"/></a>< /td>
				95		<td><a h ref="Discl osureSumma ryReportRe sults.do_s ec?disclos ureSummary SortValue= vaFacility Number&dis closureSum marySortDi rection=AS C"><br><im g alt="sor t this col umn in asc ending ord er" src="r es/sort-as cending.jp g" border= "0"/></a>< a> - </a>< a href="Di sclosureSu mmaryRepor tResults.d o_sec?disc losureSumm arySortVal ue=vaFacil ityNumber& disclosure SummarySor tDirection =DESC"><im g alt="sor t this col umn in des cending or der" src=" res/sort-d escending. jpg" borde r="0"/></a ></td>
				96		</c: when>
				97		</c:choo se>
				98		<td><a href="Dis closureSum maryReport Results.do _sec?discl osureSumma rySortValu e=total&di sclosureSu mmarySortD irection=A SC"><br><i mg alt="so rt this co lumn in as cending or der" src=" res/sort-a scending.j pg" border ="0"/></a> <a> - </a> <a href="D isclosureS ummaryRepo rtResults. do_sec?dis closureSum marySortVa lue=total& disclosure SummarySor tDirection =DESC"><im g alt="sor t this col umn in des cending or der" src=" res/sort-d escending. jpg" borde r="0"/></a ></td>
				99		</tr>
				100		<pg:forEac h var="r" items="${d isclosureS ummaryResu lts}" varS tatus="i"
				101		paginato r="${pagin ator}">
				102		<tr cl ass="hor-m inimalist- b">
				103		<t d style="f loat: left ; width: 1 00%;">${r. partnerOrg }</td>
				104		<c :choose>
				105		<c:when test="${di sclosureSu mmaryQuery Source eq 'Exchange' }">
				106		<td> ${r.vaFaci lity}</td>
				107		<td> ${r.vaFaci lityNumber }</td>
				108		</c:when >
				109		</ c:choose>
				110		<t d>${r.tota l}</td>
				111		</tr>
				112		</pg:forEa ch>
				113		</tb ody>
				114		</table>
				115		</ c:when>
				116		<c :otherwise >
				117		No recor ds were fo und.
				118		</ c:otherwis e>
				119		</c:ch oose>
				120		<c:if test="${!e mpty discl osureSumma ryTotalCou nt && !emp ty disclos ureSummary Results}">
				121		<d iv>
				122		<strong> Grand Tota l:</strong > ${disclo sureSummar yTotalCoun t}
				123		</ div>
				124		</c:if >
				125		</f:mainTe mplate>
				126		=======
				127		<!DOCTYPE HTML PUBLI C "-//W3C/ /DTD HTML 4.01 Trans itional//E N"
				128		"http: //www.w3.o rg/TR/html 4/loose.dt d">
				129
				130		<html lang ="en">
				131		<head>
				132		<t itle>Veter ans Author ization & Preference s Disclosu res Report Results</ title>
				133		<%
				134		String u serName = UserHelper .getUserNa me(request );
				135		%>
				136		<% @include f ile="metaC ommon.jsp" %>
				137		</head >
				138		<body>
				139		<jsp:inclu de page="h eader.jsp" >
				140		<jsp:p aram name= "userName" value="<% =userName% >"/>
				141		</jsp:incl ude>
				142		<table bor der="0" ce llpadding= "0" cellsp acing="0" width="100 %" summary ="table is used for layout pur poses" id= "main-cont ent-table" >
				143		<t body>
				144		<t r>
				145		<jsp:inc lude page= "leftMenu. jsp">
				146		<jsp :param nam e="userNam e" value=" <%=userNam e%>" />
				147		</jsp:in clude>
				148		<th scop e="row" st yle="float : left; fo nt-size: 0 ; height: 0;">VA Con tent</th>
				149		<td id=" content-va ">
				150		<a n ame="conte nt-area">< /a>
				151		<!-- START: SI TE NAME BA R -->
				152		<p c lass="titl e-bar"><!- - START: S ITE NAME - ->Disclosu res Summar y Report<! -- END: SI TE NAME -- ></p>
				153		<cpp :errors />
				154		<!-- END: SITE NAME BAR -->
				155		<tab le border= "0" cellpa dding="0" cellspacin g="0" widt h="100%" s ummary="ta ble is use d for layo ut purpose s">
				156		<tbody>
				157		<tr>
				158		<t h scope="r ow" style= "float: le ft; font-s ize: 0; he ight: 0;"> Main Conte nt</th>
				159		<t d id="cont ent-main">
				160		<table w idth="100% " summary= "This tabl e is used for layout purposes" >
				161		<!-- S TART: PAGE TITLE ARE A -->
				162		<!-- E ND: PAGE T ITLE AREA -->
				163		<tr>
				164		<t h scope="r ow" style= "float: le ft; font-s ize: 0; he ight: 0;"> Page Conte nt</th>
				165		<td>
				166		<!-- STA RT: PAGE C ONTENT -->
				167		<table SUM MARY="This table is for format ting purpo ses only." >
				168		<tbody >
				169		<t r>
				170		<th scop e="row" st yle="float : left; fo nt-size: 0 ; height: 0;">Table Content</t h>
				171		<td>
				172		<tab le class=" ver-minima list">
				173		<tbody>
				174		<tr>
				175		<f orm>
				176		<input n ame="expor tToExcel" alt="Expor t to Excel " class="b utton" typ e="submit"
				177		v alue="Expo rt to Exce l" />
				178		</ form>
				179		<t h scope="r ow" style= "border-bo ttom: none ; float: l eft; font- size: 0; h eight: 0;" >Export</t h>
				180		<t d></td>
				181		<t d></td>
				182		<t d></td>
				183		<t d></td>
				184		</tr>
				185		<tr cl ass="dateF ilters">
				186		<t h scope="r ow" style= "border-bo ttom: none ; float: l eft; font- size: 0; h eight: 0;" >Dates</th >
				187		<t d class="d atePadding ">Start Da te</td>
				188		<t d><c:choos e>
				189		<c:w hen test=" ${!empty d isclosureS ummaryQuer yStartDate }">
				190		<fmt:forma tDate patt ern="MM/dd /yyyy"
				191		value= "${disclos ureSummary QueryStart Date}" />
				192		</c: when>
				193		<c:o therwise>
				194		N/A
				195		</c:otherw ise>
				196		</c:choo se>
				197		</ td>
				198		<t d class="d atePadding ">End Date </td>
				199		<t d><c:choos e>
				200		<c:w hen test=" ${!empty d isclosureS ummaryQuer yEndDate}" >
				201		<fmt:forma tDate patt ern="MM/dd /yyyy"
				202		value= "${disclos ureSummary QueryEndDa te}" />
				203		</c: when>
				204		<c:o therwise>
				205		N/A
				206		</c:otherw ise>
				207		</c:choo se>
				208		</ td>
				209		</tbody>
				210		</ta ble>
				211		<c:c hoose>
				212		<c:when te st="${!emp ty disclos ureSummary Results}">
				213		<br/>
				214		<table >
				215		<t body>
				216		<tr clas s="hor-min imalist-c" >
				217		<c:c hoose>
				218		<c:when te st="${disc losureSumm aryQuerySo urce eq 'E xchange'}" >
				219		<th sc ope="col"> <span data -tooltip=" <c:out val ue="${desc riptors['d isclosureS ummaryRepo rtOrganiza tionColumn ']}"/>" id ="organiza tionHeader "><c:out v alue="${or ganization Name}"/> O rganizatio n</span></ td>
				220		<th sc ope="col"> <span data -tooltip=" <c:out val ue="${desc riptors['d isclosureR eportFacil ityColumn' ]}"/>" id= "facilityH eader">Pat ient Prefe rred Facil ity</span> </td>
				221		<td st yle="borde r-bottom: none;"><sp an data-to oltip="<c: out value= "${descrip tors['pati entPreferr edFacility StationIdC olumn']}"/ >" id="fac ilityNumbe rHeader">P atient Pre ferred Fac ility Stat ion ID</sp an></td>
				222		</c:when>
				223		<c:otherwi se>
				224		<th sc ope="col"> <span data -tooltip=" <c:out val ue="${desc riptors['d isclosureS ummaryRepo rtOrganiza tionColumn ']}"/>" id ="organiza tionHeader ">Direct E ndpoint</s pan></td>
				225		</c:otherw ise>
				226		</c: choose>
				227		<th scope="col "><span da ta-tooltip ="<c:out v alue="${de scriptors[ 'disclosur eSummaryRe portTotalC olumn']}"/ >" data-to oltip-posi tion="left " id="tota lHeader">T otal</span ></td>
				228		</tr>
				229		<tr clas s="hor-min imalist-c" >
				230		<td> <a href="D isclosureS ummaryRepo rtResults. do_sec?dis closureSum marySortVa lue=partne rOrg&discl osureSumma rySortDire ction=ASC" ><br><img alt="sort this colum n in ascen ding order " src="res /sort-asce nding.jpg" border="0 "/></a><a> - </a><a href="Disc losureSumm aryReportR esults.do_ sec?disclo sureSummar ySortValue =partnerOr g&disclosu reSummaryS ortDirecti on=DESC">< img alt="s ort this c olumn in d escending order" src ="res/sort -descendin g.jpg" bor der="0"/>< /a></td>
				231		<c:c hoose>
				232		<c:when te st="${disc losureSumm aryQuerySo urce eq 'E xchange'}" >
				233		<td><a href="Dis closureSum maryReport Results.do _sec?discl osureSumma rySortValu e=vaFacili ty&disclos ureSummary SortDirect ion=ASC">< br><img al t="sort th is column in ascendi ng order" src="res/s ort-ascend ing.jpg" b order="0"/ ></a><a> - </a><a hr ef="Disclo sureSummar yReportRes ults.do_se c?disclosu reSummaryS ortValue=v aFacility& disclosure SummarySor tDirection =DESC"><im g alt="sor t this col umn in des cending or der" src=" res/sort-d escending. jpg" borde r="0"/></a ></td>
				234		<td><a href="Dis closureSum maryReport Results.do _sec?discl osureSumma rySortValu e=vaFacili tyNumber&d isclosureS ummarySort Direction= ASC"><br>< img alt="s ort this c olumn in a scending o rder" src= "res/sort- ascending. jpg" borde r="0"/></a ><a> - </a ><a href=" Disclosure SummaryRep ortResults .do_sec?di sclosureSu mmarySortV alue=vaFac ilityNumbe r&disclosu reSummaryS ortDirecti on=DESC">< img alt="s ort this c olumn in d escending order" src ="res/sort -descendin g.jpg" bor der="0"/>< /a></td>
				235		</c:when>
				236		</c: choose>
				237		<td> <a href="D isclosureS ummaryRepo rtResults. do_sec?dis closureSum marySortVa lue=total& disclosure SummarySor tDirection =ASC"><br> <img alt=" sort this column in ascending order" src ="res/sort -ascending .jpg" bord er="0"/></ a><a> - </ a><a href= "Disclosur eSummaryRe portResult s.do_sec?d isclosureS ummarySort Value=tota l&disclosu reSummaryS ortDirecti on=DESC">< img alt="s ort this c olumn in d escending order" src ="res/sort -descendin g.jpg" bor der="0"/>< /a></td>
				238		</tr>
				239		<pg:forE ach var="r " items="$ {disclosur eSummaryRe sults}" va rStatus="i "
				240		pagi nator="${p aginator}" >
				241		<tr class="hor -minimalis t-b">
				242		<td style= "float: le ft; width: 100%;"><c :out value ="${r.part nerOrg}"/> </td>
				243		<c:choose>
				244		<c:whe n test="${ disclosure SummaryQue rySource e q 'Exchang e'}">
				245		<t d><c:out v alue="${r. vaFacility }"/></td>
				246		<t d><c:out v alue="${r. vaFacility Number}"/> </td>
				247		</c:wh en>
				248		</c:choos e>
				249		<td><c:out value="${ r.total}"/ ></td>
				250		</tr >
				251		</pg:for Each>
				252		</ tbody>
				253		</tabl e>
				254		</c:when>
				255		<c:otherwi se>
				256		No records w ere found.
				257		</c:ot herwise>
				258		</c: choose>
				259		<tab le>
				260		<c:i f test="${ !empty dis closureSum maryTotalC ount && !e mpty discl osureSumma ryResults} ">
				261		<t r>
				262		<td>
				263		<b>G rand Total :</b>
				264		</td>
				265		<td>
				266		<c:o ut value=" ${disclosu reSummaryT otalCount} "/>
				267		</td>
				268		</ tr>
				269		</c:if>
				270		</ta ble>
				271		</td>
				272		</ tr>
				273		</tbod y>
				274		</table>
				275		<!-- THE B ODY CONTEN T END -->
				276		< /td>
				277		</tr>
				278		</tabl e>
				279		</ td>
				280		</tr>
				281		</tbody>
				282		</ta ble>
				283		<!-- START: PA GE FOOTER -->
				284		<%@i nclude fil e="footer. jsp" %>
				285		<!-- END: PAGE FOOTER -- >
				286		<!-- END: PAGE CONTENT - ->
				287		</td>
				288		</ tr>
				289		</tbod y>
				290		</table>
				291		</body>
				292		</html>
				293		>>>>>>> va pe_incr_2
				294		--%>