127. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 12/13/2018 10:35:23 AM Eastern Standard 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.

127.1 Files compared

#	Location	File	Last Modified
1	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\ccht\model\report	AbstractCompletedReport.java	Fri Dec 7 17:36:34 2018 UTC
2	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\ccht\model\report	AbstractCompletedReport.java	Wed Dec 12 22:33:38 2018 UTC

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

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

127.4 Active regular expressions

No regular expressions were active.

127.5 Comparison detail

	1	/******* ****** ****** ****** ****** ****** *******
	2	* Copyrig ht � 2010 VHA. All r ights rese rved
	3	******* ****** ****** ****** ****** ****** *******/
	4	package go v.va.med.c cht.model. report;
	5
	6	import jav a.util.Dat e;
	7
	8	import org .hibernate .annotatio ns.Formula ;
	9
	10	import gov .va.med.cc ht.model.t erminology .StandardR eport;
	11	import gov .va.med.fw .model.Abs tractKeyed Entity;
	12	import gov .va.med.fw .report.Re portExport edType;
	13	import gov .va.med.fw .util.Stri ngUtils;
	14
	15	/**
	16	*
	17	* project : CCHT
	18	* @author DNS
	19	*/
	20	public cla ss Abstrac tCompleted Report ext ends Abstr actKeyedEn tity<Objec t> {
	21
	22	pr ivate stat ic final l ong serial VersionUID = -666921 8898281850 898L;
	23
	24	// The Stand ardReport type this complete r eport belo ngs to
	25	pr ivate Stan dardReport standardR eport;
	26	pr ivate Repo rtExported Type fileT ype;
	27	pr ivate Date fromDate;
	28	pr ivate Date toDate;
	29	pr ivate Date asOfDate;
	30	pr ivate Stri ng reportN ame;
	31	pr ivate Stri ng reportP arameterTe xt;
	32	pr ivate Stri ng userNam e;
	33	pr ivate Date completed Date;
	34	pr ivate Date inactivat edDate;
	35	pr ivate Date expiratio nDate;
	36	@F ormula(val ue = "(sel ect isnull (u.last_na me,'') + ' , ' + isnu ll(u.first _name,'')+ ' ' + isnu ll(u.middl e_name,'') from ht.a pp_user u where u.us er_name = report_gen erated_by) ")
	37	pr ivate Stri ng userFul lName;
	38	pu blic Stand ardReport getStandar dReport() {
	39	retu rn standar dReport;
	40	}
	41	pu blic void setStandar dReport(St andardRepo rt standar dReport) {
	42	this .standardR eport = st andardRepo rt;
	43	}
	44	pu blic Repor tExportedT ype getFil eType() {
	45	retu rn fileTyp e;
	46	}
	47	pu blic void setFileTyp e(ReportEx portedType fileType) {
	48	this .fileType = fileType ;
	49	}
	50	pu blic Date getFromDat e() {
	51	retu rn fromDat e;
	52	}
	53	pu blic void setFromDat e(Date fro mDate) {
	54	this .fromDate = fromDate ;
	55	}
	56	pu blic Date getToDate( ) {
	57	retu rn toDate;
	58	}
	59	pu blic void setToDate( Date toDat e) {
	60	this .toDate = toDate;
	61	}
	62	pu blic Date getAsOfDat e() {
	63	retu rn asOfDat e;
	64	}
	65	pu blic void setAsOfDat e(Date asO fDate) {
	66	this .asOfDate = asOfDate ;
	67	}
	68	pu blic Strin g getRepor tName() {
	69	retu rn reportN ame;
	70	}
	71	pu blic void setReportN ame(String reportNam e) {
	72	this .reportNam e = report Name;
	73	}
	74	pu blic Strin g getRepor tParameter Text() {
	75	retu rn reportP arameterTe xt;
	76	}
	77	pu blic void setReportP arameterTe xt(String reportPara meterText) {
	78	this .reportPar ameterText = reportP arameterTe xt;
	79	}
	80	pu blic Strin g getUserN ame() {
	81	retu rn userNam e;
	82	}
	83	pu blic void setUserNam e(String u serName) {
	84	this .userName = userName ;
	85	}
	86	pu blic Date getComplet edDate() {
	87	retu rn complet edDate;
	88	}
	89	pu blic void setComplet edDate(Dat e complete dDate) {
	90	this .completed Date = com pletedDate ;
	91	}
	92	pu blic Date getInactiv atedDate() {
	93	retu rn inactiv atedDate;
	94	}
	95	pu blic void setInactiv atedDate(D ate inacti vatedDate) {
	96	this .inactivat edDate = i nactivated Date;
	97	}
	98	pu blic Date getExpirat ionDate() {
	99	retu rn expirat ionDate;
	100	}
	101	pu blic void setExpirat ionDate(Da te expirat ionDate) {
	102	this .expiratio nDate = ex pirationDa te;
	103	}
	104	pu blic Strin g getUserF ullName() {
	105	retu rn (String Utils.isEm pty(userFu llName) \|\| ",".equal s(userFull Name.trim( ))) ? getU serName()
	106	: userFu llName;
	107	}
	108	pu blic void setUserFul lName(Stri ng userFul lName) {
	109	this .userFullN ame = user FullName;
	110	}
	111	}