120. EPMO Open Source Coordination Office Redaction File Detail Report

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

120.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\qir	QIRRemarks.java	Fri Dec 7 17:36:32 2018 UTC
2	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\ccht\model\qir	QIRRemarks.java	Wed Dec 12 22:33:38 2018 UTC

120.2 Comparison summary

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

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

120.4 Active regular expressions

No regular expressions were active.

120.5 Comparison detail

	1	/**
	2	*
	3	*/
	4	package go v.va.med.c cht.model. qir;
	5
	6	import jav a.util.Dat e;
	7
	8	import jav ax.persist ence.Colum n;
	9	import jav ax.persist ence.Entit y;
	10	import jav ax.persist ence.Gener atedValue;
	11	import jav ax.persist ence.Gener ationType;
	12	import jav ax.persist ence.Id;
	13	import jav ax.persist ence.JoinC olumn;
	14	import jav ax.persist ence.ManyT oOne;
	15	import jav ax.persist ence.Table ;
	16	import jav ax.persist ence.Trans ient;
	17	import jav ax.validat ion.constr aints.NotN ull;
	18	import jav ax.validat ion.constr aints.Size ;
	19
	20	import org .hibernate .annotatio ns.Formula ;
	21
	22	import gov .va.med.cc ht.model.C CHTAuditFi elds;
	23
	24	/**
	25	* @author DNS
	26	*
	27	*/
	28	@Entity
	29	@Table(sch ema = "qir ", name = "QIR_REMAR KS")
	30	public cla ss QIRRema rks extend s CCHTAudi tFields im plements C omparable< QIRRemarks > {
	31
	32	pr ivate Long id;
	33	pr ivate QIR qir = null ;
	34	pr ivate Date date = nu ll;
	35	@N otNull
	36	@S ize(min = 0, max = 2 000)
	37	pr ivate Stri ng remarks = null;
	38
	39	pr ivate Stri ng submitt edByName = null;
	40
	41	@I d
	42	@G eneratedVa lue(strate gy = Gener ationType. IDENTITY)
	43	@C olumn(name ="QIR_REMA RK_ID", un ique = tru e, nullabl e = false)
	44	pu blic Long getId() {
	45	retu rn id;
	46	}
	47
	48	pu blic void setId(Long id) {
	49	this .id = id;
	50	}
	51
	52	@M anyToOne
	53	@J oinColumn( name = "QI R_ID")
	54	pu blic QIR g etQir() {
	55	retu rn qir;
	56	}
	57
	58	pu blic void setQir(QIR qir) {
	59	this .qir = qir ;
	60	}
	61
	62	@C olumn(name ="REMARK_D ATE")
	63	pu blic Date getDate() {
	64	retu rn date;
	65	}
	66
	67	pu blic void setDate(Da te date) {
	68	this .date = da te;
	69	}
	70
	71	@C olumn(name ="REMARK_T EXT")
	72	pu blic Strin g getRemar ks() {
	73	retu rn remarks ;
	74	}
	75
	76	pu blic void setRemarks (String re marks) {
	77	this .remarks = remarks;
	78	}
	79
	80	@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 = RECORD_CRE ATED_BY)")
	81	pu blic Strin g getSubmi ttedByName () {
	82	retu rn submitt edByName;
	83	}
	84
	85	pu blic void setSubmitt edByName(S tring subm ittedByNam e) {
	86	this .submitted ByName = s ubmittedBy Name;
	87	}
	88
	89	@O verride
	90	pu blic int c ompareTo(Q IRRemarks o) {
	91	if ( o != null) {
	92	QIRRem arks other = (QIRRem arks) o;
	93	Date o therDate = other.get Date();
	94	if (ot herDate == null \|\| d ate == nul l)
	95	return 0 ; // no da te not an expected s cenario
	96	return date.comp areTo(othe rDate);
	97	}
	98	retu rn 0;
	99	}
	100	}