633. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 7/10/2017 1:02:03 PM Central 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.

633.1 Files compared

#	Location	File	Last Modified
1	C:\AraxisMergeCompare\Pri_un\WAR\VixGuiWebApp-0.1	template.jsp	Sat Oct 1 19:33:44 2016 UTC
2	C:\AraxisMergeCompare\Pri_re\WAR\VixGuiWebApp-0.1	template.jsp	Thu Jul 6 17:17:02 2017 UTC

633.2 Comparison summary

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

633.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

633.4 Active regular expressions

No regular expressions were active.

633.5 Comparison detail

	1	<%@ page
	2	la nguage="ja va"
	3	im port="java .util., j ava.text. "
	4	pa geEncoding ="ISO-8859 -1"
	5	se ssion="fal se"
	6	co ntentType= "text/html ; charset= ISO-8859-1 "%>
	7	<%@ taglib uri="http ://imaging . URL /vix/menu" prefix="m enu"%>
	8
	9	<%
	10	Da teFormat d fDateOnly = new Simp leDateForm at("MM/dd/ yyyy");
	11
	12	St ring conte xtPath = r equest.get ContextPat h();
	13	St ring servl etPath = r equest.get ServletPat h();
	14	St ring baseP ath = requ est.getSch eme()+":// "+request. getServerN ame()+":"+ request.ge tServerPor t()+contex tPath;
	15
	16	Da te fromDat e = gov.va .med.imagi ng.DateUti l.currentD ayStart();
	17	St ring fromD ateParam = request.g etParamete r("fromDat e");
	18	if (fromDateP aram != nu ll)
	19	from Date = dfD ateOnly.pa rse( fromD ateParam ) ;
	20	fr omDate = g ov.va.med. imaging.Da teUtil.day Start(from Date);
	21	fr omDatePara m =dfDateO nly.format (fromDate) ;
	22
	23	Da te toDate = gov.va.m ed.imaging .DateUtil. currentDay End();
	24	St ring toDat eParam = r equest.get Parameter( "toDate");
	25	if (toDatePar am != null )
	26	toDa te = dfDat eOnly.pars e( toDateP aram );
	27	to Date = gov .va.med.im aging.Date Util.dayEn d(toDate);
	28	to DateParam = dfDateOn ly.format( toDate);
	29	%>
	30
	31	<!DOCTYPE HTML PUBLI C "-//W3C/ /DTD HTML 4.01 Trans itional//E N">
	32	<html>
	33	<h ead>
	34	<sty le type="t ext/css" m edia="scre en">
	35	@imp ort url("s tyle/scree n.css");
	36	</st yle>
	37
	38	<tit le>Vista I maging Web Access</t itle>
	39
	40	<met a http-equ iv="pragma " content= "no-cache" >
	41	<met a http-equ iv="cache- control" c ontent="no -cache">
	42	<met a http-equ iv="expire s" content ="0">
	43	<met a http-equ iv="keywor ds" conten t="Vista V IX Imaging ">
	44	<met a http-equ iv="descri ption" con tent="Vist A Imaging Web Access ">
	45
	46	<tit le>VIX - T ransaction Log</titl e>
	47	<scr ipt type=" text/javas cript" src ="script/b rowser.js" >
	48	</sc ript>
	49	<scr ipt type=" text/javas cript" src ="script/c alendar.js ">
	50	</sc ript>
	51	<scr ipt type=" text/javas cript" src ="script/m enu-for-ap plications .js">
	52	</sc ript>
	53	<scr ipt type=" text/javas cript" src ="script/v ix.js">
	54	</sc ript>
	55	</ head>
	56
	57	<b ody onload ="load();" id="vix">
	58	<div id="pageH eader">
	59	<h1><s pan>VIX</s pan></h1>
	60	</di v>
	61	<!-- The main menu is ge nerated by a tag lib so that u nreachable items are not displ ayed -->
	62	<men u:Menu
	63	menuId ="menuMode l"
	64	menuCl ass="menu"
	65	subMen uClass="ma inMenuSubM enu"
	66	menuIt emClass="m ainMenuIte m"
	67	menuDi vId="menuD iv" />
	68
	69	<div id="conta iner">
	70	<div i d="selecti on">
	71	<h1>Sele ction Head er</h1>
	72	<ol>
	73	<li>Select ion Item 1 </li>
	74	<li>Select ion Item 2 </li>
	75	<li>
	76	Date R ange:<br/>
	77	<s pan id="fr omDateCont ainer">
	78	<inp ut type="t ext" id="f romDate" n ame="fromD ate"
	79	value= <%="\"" + fromDatePa ram + "\"" %>
	80	maxlen gth="10" w idth="100p x"
	81	title= "cssbody=[ dvbdy1] cs sheader=[d vhdr1] hea der=[Start Date] bod y=[Include transacti ons from t his date t o the end date.]"
	82	/>
	83	&nbs p;
	84	<img class="bu tton-img" src="image s/Calendar .png" oncl ick="fromD atePicker. show();" / >
	85	</ span>
	86	<br/>- to-<br/>
	87	<s pan id="to DateContai ner">
	88	<inp ut type="t ext" id="t oDate" nam e="toDate"
	89	value= <%="\"" + toDatePara m + "\""%>
	90	maxlen gth="10" w idth="100p x"
	91	title= "cssbody=[ dvbdy1] cs sheader=[d vhdr1] hea der=[End D ate] body= [Include t ransaction s from the start dat e to this date.]"
	92	/>
	93	&nbs p;
	94	<img class="bu tton-img" src="image s/Calendar .png" oncl ick="toDat ePicker.sh ow();" />
	95	</ span>
	96	</li>
	97	</ol>
	98	</div>
	99	<div i d="support ingText">
	100	<h1>Supp orting Tex t Title</h 1>
	101	<p>
	102	This is a template page, cop y this to get the ba sic format ting of a
	103	Vix GUI page.
	104	</p>
	105	</div>
	106	</di v>
	107	<div id="pageF ooter">
	108	<jsp:i nclude flu sh="true" page="foot er.html" / >
	109	</di v>
	110	</ body>
	111	</html>