36. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 6/11/2019 10:54:09 AM 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.

36.1 Files compared

# Location File Last Modified
1 HTRE_P3_v14.5_iter_4_build_14.zip\java\gov\va\med\ccht\persistent\hibernate StandardReportDataDAOImpl.java Wed May 29 15:26:40 2019 UTC
2 HTRE_P3_v14.5_iter_4_build_14.zip\java\gov\va\med\ccht\persistent\hibernate StandardReportDataDAOImpl.java Mon Jun 10 19:19:21 2019 UTC

36.2 Comparison summary

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

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

36.4 Active regular expressions

No regular expressions were active.

36.5 Comparison detail

  1   /********* ********** ********** ********** ********** ********** *********
  2    * Copyrig ht � 2010  VHA. All r ights rese rved
  3    ********* ********** ********** ********** ********** ********** *********/
  4   package go v.va.med.c cht.persis tent.hiber nate;
  5  
  6   import jav a.util.Cal endar;
  7   import jav a.util.Dat e;
  8   import jav a.util.Map ;
  9   import jav a.util.Tim eZone;
  10  
  11   import jav ax.transac tion.Trans actional;
  12  
  13   import org .springfra mework.ste reotype.Re pository;
  14  
  15   import gov .va.med.cc ht.model.c ommon.DIRe portParame ters;
  16   import gov .va.med.cc ht.model.r eport.Repo rtParamete rs;
  17   import gov .va.med.cc ht.model.r eport.Repo rtSetup;
  18   import gov .va.med.cc ht.model.r eport.sche duled.Date RangeBound ary;
  19   import gov .va.med.fw .util.Date Utils;
  20  
  21   /**
  22    * 
  23    * 
  24    * IHTA oh rs_common  Nov 4, 201 0
  25    * 
  26    * @author   DNS
  27    */
  28   @Repositor y
  29   @Transacti onal
  30   public cla ss Standar dReportDat aDAOImpl e xtends Abs tractStand ardReportD ataDAOImpl  {
  31           
  32           pr ivate stat ic final l ong serial VersionUID  = -562395 9498516400 752L;
  33  
  34           pu blic stati c final lo ng MILLISE CONDS_DAY  = 24 * 60  * 60 * 100 0;
  35  
  36           pr ivate bool ean postPr ocessRequi red;
  37           pr ivate bool ean pagina ted;
  38           pr ivate Stri ng queryNa me;
  39           
  40           
  41           pu blic boole an isPostP rocessRequ ired() {
  42                    retu rn postPro cessRequir ed;
  43           }
  44  
  45           pu blic void  setPostPro cessRequir ed(boolean  postProce ssRequired ) {
  46                    this .postProce ssRequired  = postPro cessRequir ed;
  47           }
  48  
  49           pu blic boole an isPagin ated() {
  50                    retu rn paginat ed;
  51           }
  52  
  53           pu blic void  setPaginat ed(boolean  paginated ) {
  54                    this .paginated  = paginat ed;
  55           }
  56  
  57           pu blic Strin g getQuery Name() {
  58                    retu rn queryNa me;
  59           }
  60  
  61           pu blic void  setQueryNa me(String  queryName)  {
  62                    this .queryName  = queryNa me;
  63           }
  64  
  65           @O verride 
  66           pr otected Ma p<String,  Object> ge tQueryPara meters(Rep ortSetup s etup) { 
  67                    Map< String, Ob ject> para mMap = sup er.getQuer yParameter s(setup);
  68                    Repo rtParamete rs params  = setup !=  null ? se tup.getRep ortParamet ers() : nu ll;
  69                    if(p arams!=nul l) 
  70                    {
  71                    DIRe portParame ters diRep ortParams  = (DIRepor tParameter s) params;
  72                    Date RangeBound ary schedu ledReportF romDate =  params.get ScheduledR eportFromD ate();
  73                    Date RangeBound ary schedu ledReportT oDate = pa rams.getSc heduledRep ortToDate( );
  74  
  75                    bool ean isSche duledRepor t = schedu ledReportF romDate !=  null && s cheduledRe portToDate  != null;
  76  
  77                    Date  reportSta rtDate = d iReportPar ams.getRep ortWeek()  == null ?  null : diR eportParam s.getRepor tWeek().ge tStartDate ();
  78                    Date  reportEnd Date = diR eportParam s.getRepor tWeek() ==  null ? nu ll : diRep ortParams. getReportW eek().getE ndDate();
  79           
  80                    if ( isSchedule dReport) {
  81                             //calc ulate the  dates
  82                    } el se {
  83                             //adju st the dat es if need ed or comp ute other  required d ates
  84                    }
  85                    
  86                    if ( diReportPa rams.getFr omDate() ! = null) {
  87                             paramM ap.put("fr omDate", d iReportPar ams.getFro mDate());
  88                    }els e {
  89                             //defa ult from d ate
  90                             Calend ar cal = C alendar.ge tInstance( );
  91                             cal.se t(2000,0,1 ,0,0,0); / /Olddest d ate for IH TA databas e
  92                             paramM ap.put("fr omDate", c al.getTime ());
  93                    }
  94                    if ( diReportPa rams.getTo Date() !=  null) {
  95                             paramM ap.put("to Date", diR eportParam s.getToDat e());
  96                    }els e {                  
  97                             //defa ult to dat e
  98                             paramM ap.put("to Date", Dat eUtils.get TomorrowDa te());
  99                    } 
  100                    if ( reportStar tDate != n ull) {
  101                             paramM ap.put("re portStartD ate", repo rtStartDat e);
  102                    }
  103                    if ( reportEndD ate != nul l) {
  104                             paramM ap.put("re portEndDat e", report EndDate);
  105                    }
  106  
  107                    //Vi sn
  108                    if ( diReportPa rams.getVi sn() != nu ll) {
  109                             paramM ap.put("al lVisn", "V isn");
  110                             paramM ap.put("vi snId", diR eportParam s.getVisn( ).getId()) ;
  111                    }els e {
  112                             paramM ap.put("al lVisn", "a llVisn");
  113                             paramM ap.put("vi snId", new  Long(0));
  114                    }
  115                    //Fa cilities
  116                    if ( diReportPa rams.getFa cility() ! = null) {
  117                             paramM ap.put("al lFacilitie s", "Facil itiy");
  118                             paramM ap.put("fa cilityId",  diReportP arams.getF acility(). getId());
  119                    }els e {
  120                             paramM ap.put("al lFacilitie s", "allFa cilities") ;
  121                             paramM ap.put("fa cilityId",  new Long( 0));
  122                    }
  123  
  124                    }                 
  125                    // r eturn para meter map
  126                    retu rn paramMa p; 
  127           }
  128  
  129           //  Returns t he date in  the serve r time zon e as enter ed by the  user
  130           pr otected Da te getUser Date(Date  userDate,  TimeZone u serTz) {
  131                    
  132                    if ( userDate = = null) {
  133                             return  null;
  134                    }
  135                    
  136                    Cale ndar cal =  Calendar. getInstanc e();
  137                    
  138                    cal. setTime(us erDate);
  139                    cal. setTimeZon e(userTz);
  140                    
  141                    retu rn cal.get Time();
  142  
  143           }
  144  
  145           pr otected Da te getDefa ultFromDat e() {
  146                    retu rn DateUti ls.createC alendar(19 00, 1, 1). getTime();
  147           }
  148  
  149           pr otected Da te addDay( Date userD ate) {
  150                    Cale ndar cal =  Calendar. getInstanc e();
  151                    cal. setTime(us erDate);
  152                    cal. add(Calend ar.DATE, 1 );
  153                    retu rn cal.get Time();
  154           }
  155   }

Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.