From 66ed639cffb352be3c262f6c6fead68549167e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= Date: Tue, 14 Mar 2017 17:56:46 +0100 Subject: [PATCH 01/31] Added flag (cherry picked from commit c12851ece897a072f3d1c5e2175505aff5907f25) --- .../src/main/resources/META-INF/dhis/beans.xml | 1 + .../src/main/resources/i18n_global.properties | 1 + .../webapp/dhis-web-commons/flags/cordaid.png | Bin 0 -> 6296 bytes 3 files changed, 2 insertions(+) create mode 100644 dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/cordaid.png diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml b/dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml index dfcca77d..64bdb148 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml @@ -1088,6 +1088,7 @@ colombia congo_brazzaville congo_kinshasa + cordaid demoland ecowas ecuador diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties index 2382fcec..2d1c97a4 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties @@ -852,6 +852,7 @@ colombia=Colombia demoland=Demoland congo_brazzaville=Republic of the Congo congo_kinshasa=Democratic Republic of the Congo +cordaid=Cordaid east_africa_community=East Africa Community ecowas=ECOWAS ecuador=Ecuador diff --git a/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/cordaid.png b/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/cordaid.png new file mode 100644 index 0000000000000000000000000000000000000000..651a905283ba04967b5ee6ab209d20e4bbf3512c GIT binary patch literal 6296 zcmZWucQ_nTyPs9psu6XSXhB#Z%33AJB6f0_uTu}oqcBJ*>h&k?7ZjwmGe%lzOEWI3=RVTfLcRc#Q;1Pg1a%42s{or zz{0>2*<&p=72xXMr?9g;6>OpKR5$Yh0LttCb_kH2%K|o%`)cT@k}ng}&`AJRmz8_~ zz;aVV<(^T%+;*OmCwpIKPkV6U!o;`cn(0E{Hmk8hVnIWnS=|-<#&ggGJ04f?8G`kgo~0}Ub2dP zTYz^ZARsdOLrQP|!;I&tL}d(gL{L&X0180^XvW`)S%R87CBy`d-IN{#7l{&-y6t+E zDAs5cqWK&#^@i#PyAJkwE-{_HX3;%bQcfrl;#J{&683VUO9A~Q6@&GoWbkJU0Dy|l zr5RlX*k!HE7+>VLI2Xcb_}(es+xL z!9|FcE}ha*s{-6~01WtnGTI`E^vtcpVj@F%vz}VDNrvi_%`S2Q0Jr00RP9pXvgu9<4Yr+@jtC$Wl*-qUIv0GpjGltZfa#e5BP1X7^&F@A@+f~!a}!}M^# zI<~p{u(wb27yay^R>_^R*W<0EaIK{t1S@>%YY=f2BFa1gb`p{iN4F#s!PQ3sDBa<2 zpj3JQFebIy!W@mu>Q3$i(V_FB%&9;B2T*!7JmE_=*lOp?T#Y1!l?^fA9egHGI!``s z*8H%57Y$VqDOeXzD^-(m(b$0bAN`8JMWKq)2u6$*MVC!V!ikBJENMm`MQg?t;UnXN z3K=00Mx)OIB1g#U!n04xf1&^5uxf`aFent1q&KADxcUAqNhj z5aigXl%Vb-L-v}VzU3((z2MX5OB%DN1AG%GCH!7 zOtHoBvDePtA-|tqGLx94AqAQs;I(Lj%r7)EJ3pqb7;imq_3A$96E#8$GopWeMz9{N z**O7%T+!W*QlB;A&bdhB2hy3uiQ`WduL*yVtMy z9;iZKWKbeaNRebdmxPc0r1ul7K5xEoPc&Wp9V`PHI_CU*n=eqHzaAlsAp(?s9sa#p zj}S;5@|C3qmI5zJS?T&wsY7&VIb5UTXRtEFw1weoc@C#8gooU&2RyCvFpi7H!MWxrkd> z*94yA!NWseE;?vTZ#}{;{u-KnAkT0zZPG@J1xoVw@87brGAgnt-Ez63g7PV++L`v? z;~nJ~ntRYZ-L+U2LrtI7uUlJNCno{^{{F}usT}-=SlBT1fojo|kA2XNXOu7taXq)h1JCI$52vCr)>)>9sg+C!VvXoX za_|m~=9v@E3dWk>zEy%wtow2%J(V$pa7)5l=A6G7X659S$1;Fa1r^I!44`F{i5{LW z6s(bFwfp(#>%K>XzPJ?c?kNjxl5z=z&YMRVU(hx`-|DmG5q>rgPRUJris)C<&Tfv5 zixDK8`aCH?By>O9@Cpg7Z(@q z&B0S;I#?`L0G_3Z?XVK%CIR#1juby30{+SLQ+0!dlDiRj;T6G3O`>N5-8Z(*wDlp=$0RB z;A*?p@`EvPao5m$0p|^43I_r5%+?`wd>U(#O&iw{OO`Z;@FGa#IUc{?f%UdgRUgQmW4ga4PF}8+(;vcpZ84ZDTe+UFESEZ z^+dUM?DY?D2EQpQdwFW3>Ez~CEr`)t7s80k$gCfq+10TOc-_t%-u9b!ZNd(h3TjHi zb@)?*I<0DF#zsaCkB+dDm0Dk{zk8xki6v?GOD5LW*H2Faq1fm5d$p9$T&d9MR78mox^?i8xKyzg;KoXuXu(CBG!Zd6^E-5D`Cnd$0 zG|*_i4MJ^ciR-K!1ZHGpq@j3`ZjR^l6G;X<$FJgvzG6naz1NlcA3Zq@1h-`ylNsJR ziG(OZV<(jt<1aQ72qhpYI-;#-KFkCcPQ2~Vt%Zuk>B!2;e&0h4c!8)nUI?}h4Gj(R z;*RD|y``v-ga3PRxzO(K@8_48kZ?0qBl=bEvT1_@K10M}Zf=g`USV2L=eN7Tf8yig z?ZvYa*reeJ{fbwoV^*~$41G@vLch2-53KA(k<(sY?1t~IubY{g0ssR8!%2t&SxZ%w z&~C)_*pCw>YW}<5E>719^z`&3Xhk$q7Ti6YoLW~iEX*w|vJ4c?wi-G+JCoH*i;9-p zkHa$|Woe@$BO$-vlb`+BX5-}4<)eouyfl!#bLV|cO=abJ8bA!FCJPH+t6fk}rC8M$ z)!{Q!%`Tg434hH$W$$Ozv2S2xOhkH#Lh6^?%lEFhb`SMZ`3@Ci>(BS+wx07$%ll0d ziM^+(WX8*$Cyg^!lw?t92627ftLY}lX32suk z7J`#iU>TZ431gc%z-_$R8xG~pSN0S3o>dnD1WD5-1L%WeyvY^UW*YN@{Fe^_Va(+8 z^y*Pi0|5c_tn9t9Xx>rTD=ijODAZ*7%<77^^hnYJyL zmXu6W=M%(&)SZ@QT5XJ07i0+9X&T zdw2c*Ksn#!#s-JOVtP3^II^_wrlqgZu3Za zd2Q%kfIO|j$&%EJ<@H#Vu+w4det)rl<;3iYV>guX_H8Ncj%+_6yhPCoxu=fNs9;ywt%<_Kk2;z z!la(J>wJG0L{APrTf3~!jSvlbta+s{< z(SG5VaDQcclQO0^&7jlD`q3l&7B%+Wnjr=m)&;czp5C_;=)JBje)ED~k{dT*szz$VaW~8rg=Xy#=3S#E}{yCGQ$3 zW~&EeqlXT??%F90YBrf349hKz+fkC=XSUH;vSRUrb#=jPgMd%*`)x~0QM53=%> zX=7vK{Sq%<-@~5g#LJ$q7xWg}&MXiv`==rAZRh|SWR98G;A2;hf=tM5k$+qIlR!^T zPmo1i|4C@G3W1hK#iI zz`N+Rz|^7AX=g@Nkfv-S7To>4yu7~g26TRljirdc6YY8N_vnrH2d2Ap(6_b;2?_U0 z_CWeWJOo|H_VzY{ydrB_t#;#Y#|NAtB4#%m>UPj#?@20uLOF zXE7=~yu7^YzHqc4=6lscTr{J*RSeyKh)hhd)xIt}Ey>zr%a`0r5Fz28n^lFScgysK z7-IV}UC$u^x?(y);#rRXWJI$*nvTpgg%2N_z}UW-h5NF3gfp&w3=w%B;OQyG0K4O2 z31*JZ*RSX2v$HG`6Y1&cfeoU=`=De!F)K@hQ@!l(zt1F8Zcur78CDi^vdJZ&JSrn&vN&nh-99fKXB@8?RzzK1?)n=)W1 z>}#>@~eaC}@} z65hw+(m1!j@7+M?cqjj1M*ugy;Vnxj2CXV@3~j?M4u=C-`5O9w@?c1X9w?k}WKs7k z(9zQyu17%8wzfsR?oT7y+uP0fY@6q`G&NNoXk!gPCEOARJ-aD!)Wc^lV`2z-pTB%5 zo7o(52&ej>T4ViCfOKWZNmhb(KN>U`#6sTp_C|D|=1BS<2&TAc=SM11($ccB+1mV> zvg;vlK6-Ozlrk|eh;^&pTIdeHittd%c=CV&9DiHs4}Y$%^zVK(ey8CqX+(!n^kpJaS2o?)Eu*%0{X2JM#OCpbyyV z&Bp7uzok3BCAhkKcr11X`}3#9s_=MpotA+uZf?`gjT4UV%FEY4oPvxT9va#?VPlVr zze7V7)!W<4$jE3_dz^H2HlT6EXJN(^h&8C(;axy@+C2-|iA&Iea+i2{iJD2mw{NhB zW#LOoO8&|F;BP2pnS1LgQ|b^2_lWN1w*^rf$Ric)ptD|Fv$WY@9 zEPeClO;yzfXre*B2?;ru?moqXcvQGNS-Cj-BS244J{8zYE$vFESEY+~MFt=Kdcb62 zVr+cd?UW*Ne0-b>R$MGdNlDp#b+PNeJtu`k{yaEkQ1wEwFJAs>1}&f@oVtH@-IImt zrLQbUtcq3OYI<^VGOgnIE5?y5IcrnXK?ia6u`&E8DG{XUW)bMzNe%f^hgSC9BEbJ2 z45}}*C_g{Hvho&_Md+H`qRa!`fIp0=)IQ!YdHGB1s`RfGZ|SvnwV#oQMLRvLf#Suw z-sZ-}zLj%j%xxi|w&QQXW*Vp1Oe^!wpd+v6uZ?ll6%_%$ielQ@+bOs)#fQho^V@!9 z;fj}gNyN{UEw!JU0+%O7p(Ld;?M9(#1`y`0~+3VOgkU{?JFoV1RU z?{NgzjC|4eh7FYh`IOdShCfo+2nD|xn?H7)EfTu7v6%XlEWP?CF%Mi_TzpXMh-q-C z2`Y)bxD0zD=-Y!qgY=x7)3be{SWx`9UtGP@%0oQM6=|WRHQY<97y??eFP}dvLCyO1 zYQryZeUHJpuxNI7b9VkDkPYSTwA%G+S5s3XfSR2;ylUR=x2;U8=zB$cEU_{&I^y0y z5hqVRAiKoUL@W9Gt1%s74(7fMCvC$kP8;|ab zKNt)QT6Djpj^J7>sH?55o>DrqDZ-@XnsRU{5Co!eZL!tp?HA?HTJ!Yeo84w%*Y{=m{spqC9d)L`5a9w$T45u zn1TKzRH4ACRuqA-ugNpW#ygm4$Izwl#airZ^Y^2~SbzTs1g-LL4hPLZAneV)FnyxK zVxZ#LWR7H}9R(#<8V*PA(Q4IE%(3xojY3Q=Yvu5)w09IWfI8CH=RK${ox1zWOCr~# zNV0i%YUH3cwTDUvYxbVLZ7akl>SyBB(&k;^5YF>M_i4k9%Z7UGa)lu;-m#@$%n>g6 z9+EHB`ZZ9R4dMWuK8y>jJ$2W-5Wa1BI(50BWqP|p5Hq=H_&3IEj0Hm!LC46vpCEO< z@s|<)l=1fqW^v|^cBzu=*h8Tl+TSfp9qIt7<8G#?{Ss{0iZulkE00*%WS^ax#QaDqBgxmsmi>v zytg&lo&5empEgv;{s>;n6 zk&ikbS%CeKnJGi8*+WETWDH7CoYO`ywz(HtGanij=Jg@gKpR(P?}c(}qOv_V)lCs^ zX3EU!>osi*`BAWJ=i)J+$10BE>7g!}9S0u13M8tKhv`o4ZB{L=+nQ~Eg_gqM!@24| z|AZjAkGUyS3k82~GdsC=W#EpLmMx#_LkiT|k}LKJ6I;PIUS-J`SqfVDW8d1|74prk zPCIrXt-A7GKCK%G7%2!1rrp`$-6QF4yVvm-R`V@N`(?xHYnAYjU!gN(Z5>y s|EskBU%CCimG=Mb{r|;y@2dUqs&*I5+d8N;_znTkP}NnbLEA+B4@CJE+5i9m literal 0 HcmV?d00001 From 359ea3fb21d35bdd5228052c82671c8895c0d4ef Mon Sep 17 00:00:00 2001 From: zubaira Date: Tue, 14 Mar 2017 19:32:57 +0100 Subject: [PATCH 02/31] SMSCode case sensitive --- .../org/hisp/dhis/sms/listener/DataValueSMSListener.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/DataValueSMSListener.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/DataValueSMSListener.java index fe76f6c3..589e09b3 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/DataValueSMSListener.java +++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/DataValueSMSListener.java @@ -161,7 +161,7 @@ public void receive( IncomingSms sms ) for ( SMSCode code : smsCommand.getCodes() ) { - if ( parsedMessage.containsKey( code.getCode().toUpperCase() ) ) + if ( parsedMessage.containsKey( code.getCode() ) ) { valueStored = storeDataValue( senderPhoneNumber, orgUnit, parsedMessage, code, smsCommand, date, smsCommand.getDataset() ); @@ -219,7 +219,7 @@ private Map parse( String sms, SMSCommand smsCommand ) if ( !StringUtils.isEmpty( key ) && !StringUtils.isEmpty( value ) ) { - output.put( key.toUpperCase(), value ); + output.put( key, value ); } } @@ -252,8 +252,6 @@ private Period getPeriod( SMSCommand command, Date date ) private boolean storeDataValue( String sender, OrganisationUnit orgunit, Map parsedMessage, SMSCode code, SMSCommand command, Date date, DataSet dataSet ) { - String upperCaseCode = code.getCode().toUpperCase(); - String storedBy = SmsUtils.getUser( sender, command, userService.getUsersByPhoneNumber( sender ) ) .getUsername(); @@ -269,7 +267,7 @@ private boolean storeDataValue( String sender, OrganisationUnit orgunit, Map specialCharacters = command.getSpecialCharacters(); From 1c65dd147f9c5a734836517ef090e36a147d3a57 Mon Sep 17 00:00:00 2001 From: Jiju K Jose Date: Thu, 16 Mar 2017 14:40:16 +0100 Subject: [PATCH 03/31] Modified the audit history dialog box to show spinner while waiting for audit data --- .../angular-forms/audit-history.html | 12 ++++++++---- .../javascripts/dhis2/dhis2.angular.controllers.js | 9 ++++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/angular-forms/audit-history.html b/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/angular-forms/audit-history.html index 7b1bff4c..3da14056 100644 --- a/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/angular-forms/audit-history.html +++ b/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/angular-forms/audit-history.html @@ -1,8 +1,8 @@

{{'audit_history'| translate}}

-
-
+
+
@@ -54,10 +54,14 @@

{{'audit_history'| translate}}

-
+
{{'audit_history_unavailable'| translate}}
+
+ +
{{'loading-audit-data' | translate}}
+
-
+
\ No newline at end of file diff --git a/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.controllers.js b/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.controllers.js index fdcd00c2..74a7aa7a 100644 --- a/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.controllers.js +++ b/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.controllers.js @@ -434,7 +434,7 @@ var d2Controllers = angular.module('d2Controllers', []) $scope.close = function () { $modalInstance.close(); }; - + $scope.model.showStatus="waiting"; AuditHistoryDataService.getAuditHistoryData(eventId, dataType).then(function (data) { $scope.model.itemList = []; @@ -477,6 +477,13 @@ var d2Controllers = angular.module('d2Controllers', []) } } } + if ($scope.model.itemList.length === 0) { + $scope.model.showStatus="data_unavailable"; + } else { + $scope.model.showStatus="data_available"; + } + },function(){ + $scope.model.showStatus="data_unavailable"; }); }) From a0ef5c3dfd154b3580715bf56c107d6a75a7fa1f Mon Sep 17 00:00:00 2001 From: Ilya Nee Date: Mon, 20 Mar 2017 12:11:49 +0100 Subject: [PATCH 04/31] Avoid encodeURI for favorites name filter --- .../src/main/webapp/dhis-web-event-reports/scripts/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js b/dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js index 6cd28747..77c7450a 100644 --- a/dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js +++ b/dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js @@ -3202,8 +3202,8 @@ console.log("favorite.id", favorite.id); if (this.getValue() !== this.currentValue) { this.currentValue = this.getValue(); - var value = this.getValue(), - url = value ? encodeURI(ns.core.init.contextPath + '/api/eventReports.json?fields=id,displayName~rename(name),access&filter=displayName:ilike:' + value) : null; + var value = this.getValue().trim(), + url = value ? encodeURI(ns.core.init.contextPath + '/api/eventReports.json?fields=id,displayName~rename(name),access&filter=displayName:ilike:') + value : null; store = ns.app.stores.eventReport; store.page = 1; From c51a476a970edc40aed6b037949a9688a4f642da Mon Sep 17 00:00:00 2001 From: Stian Sandvold Date: Wed, 22 Mar 2017 09:41:18 +0100 Subject: [PATCH 05/31] Fixed a bug where a chart could not have a negative axis minimum value (cherry picked from commit a581577c7da20303d7de425c219b01e95ae6ba0f) --- .../dhis-api/src/main/java/org/hisp/dhis/chart/BaseChart.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/BaseChart.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/BaseChart.java index 95ab388c..7046b5ae 100644 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/BaseChart.java +++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/BaseChart.java @@ -47,6 +47,7 @@ import org.hisp.dhis.i18n.I18nFormat; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.Period; +import org.hisp.dhis.schema.annotation.PropertyRange; import org.hisp.dhis.user.User; import java.util.ArrayList; @@ -420,6 +421,7 @@ public void setRangeAxisMaxValue( Double rangeAxisMaxValue ) @JsonProperty @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) + @PropertyRange( min = Integer.MIN_VALUE ) public Double getRangeAxisMinValue() { return rangeAxisMinValue; From 2220021e869c8d07b27640770160165a2c3ba6b2 Mon Sep 17 00:00:00 2001 From: abyot Date: Thu, 23 Mar 2017 17:08:39 +0100 Subject: [PATCH 06/31] bug fix - typi --- .../javascripts/dhis2/dhis2.angular.validations.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.validations.js b/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.validations.js index 91694a6a..3ad1fd0c 100644 --- a/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.validations.js +++ b/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.validations.js @@ -31,7 +31,7 @@ d2Directives.directive('d2NumberValidator', function() { }; } else if(numberType === 'INTEGER'){ - ngModel.$validators.int = function(value) { + ngModel.$validators.integer = function(value) { value = value === 0 ? value.toString(): value; return value === 'null' || !value ? !isRequired : dhis2.validation.isInt(value); }; From 0eaa8705fb0d41d4ad08b7c955ef93da2fd51b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= Date: Tue, 28 Mar 2017 15:05:08 -0400 Subject: [PATCH 07/31] Event analytics tables, only generating tables with events --- .../dhis/analytics/AnalyticsTableManager.java | 7 --- .../table/AbstractJdbcTableManager.java | 54 +++++++++---------- .../table/JdbcAnalyticsTableManager.java | 13 ++++- .../table/JdbcCompletenessTableManager.java | 15 ++++-- .../JdbcCompletenessTargetTableManager.java | 8 +-- .../table/JdbcEventAnalyticsTableManager.java | 52 +++++++++--------- .../table/JdbcOrgUnitTargetTableManager.java | 8 +-- 7 files changed, 75 insertions(+), 82 deletions(-) diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsTableManager.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsTableManager.java index 92898c5d..963a17e4 100644 --- a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsTableManager.java +++ b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsTableManager.java @@ -118,13 +118,6 @@ public interface AnalyticsTableManager */ void analyzeTables( List tables ); - /** - * Returns all years for which it exists data values. - * - * @param earliest the earliest date to include as data year, null if no restriction. - */ - List getDataYears( Date earliest ); - /** * Drops the given table. * diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java index 7969e01f..7b8f0de5 100644 --- a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java +++ b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java @@ -124,15 +124,6 @@ public void preCreateTables() // Implementation // ------------------------------------------------------------------------- - @Override - @Transactional - public List getTables( Date earliest ) - { - log.info( "Get tables using earliest: " + earliest ); - - return getTables( getDataYears( earliest ) ); - } - @Override @Transactional public List getAllTables() @@ -140,26 +131,6 @@ public List getAllTables() return getTables( ListUtils.getClosedOpenList( 1500, 2100 ) ); } - private List getTables( List dataYears ) - { - List tables = new UniqueArrayList<>(); - - Calendar calendar = PeriodType.getCalendar(); - - Collections.sort( dataYears ); - - String baseName = getTableName(); - - for ( Integer year : dataYears ) - { - Period period = PartitionUtils.getPeriod( calendar, year ); - - tables.add( new AnalyticsTable( baseName, getDimensionColumns( null ), period ) ); - } - - return tables; - } - @Override public String getTempTableName() { @@ -303,6 +274,31 @@ protected void executeSilently( String sql ) log.debug( ex.getMessage() ); } } + + /** + * Generates a list of {@link AnalyticsTable} based on a list of years with data. + * + * @param dataYears the list of years of data. + */ + protected List getTables( List dataYears ) + { + List tables = new UniqueArrayList<>(); + + Calendar calendar = PeriodType.getCalendar(); + + Collections.sort( dataYears ); + + String baseName = getTableName(); + + for ( Integer year : dataYears ) + { + Period period = PartitionUtils.getPeriod( calendar, year ); + + tables.add( new AnalyticsTable( baseName, getDimensionColumns( null ), period ) ); + } + + return tables; + } /** * Checks whether the given list of columns are valid. diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java index 0ee8a6f7..993d649b 100644 --- a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java +++ b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java @@ -51,6 +51,7 @@ import org.hisp.dhis.util.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Collection; @@ -112,6 +113,15 @@ public String validState() return null; } + @Override + @Transactional + public List getTables( Date earliest ) + { + log.info( "Get tables using earliest: " + earliest ); + + return getTables( getDataYears( earliest ) ); + } + @Override public String getTableName() { @@ -389,8 +399,7 @@ public List getDimensionColumns( AnalyticsTable table ) return columns; } - @Override - public List getDataYears( Date earliest ) + private List getDataYears( Date earliest ) { String sql = "select distinct(extract(year from pe.startdate)) " + diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java index 36e81450..1917256c 100644 --- a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java +++ b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java @@ -44,6 +44,7 @@ import org.hisp.dhis.period.PeriodType; import org.hisp.dhis.system.util.DateUtils; import org.springframework.scheduling.annotation.Async; +import org.springframework.transaction.annotation.Transactional; import com.google.common.collect.Lists; @@ -65,7 +66,16 @@ public String validState() return null; } - + + @Override + @Transactional + public List getTables( Date earliest ) + { + log.info( "Get tables using earliest: " + earliest ); + + return getTables( getDataYears( earliest ) ); + } + @Override public String getTableName() { @@ -217,8 +227,7 @@ public List getDimensionColumns( AnalyticsTable table ) return columns; } - @Override - public List getDataYears( Date earliest ) + private List getDataYears( Date earliest ) { String sql = "select distinct(extract(year from pe.startdate)) " + diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java index 990761ed..6b34990f 100644 --- a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java +++ b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java @@ -64,7 +64,7 @@ public List getTables( Date earliest ) @Override public List getAllTables() { - return getTables( null ); + return getTables( new Date() ); } @Override @@ -206,12 +206,6 @@ public List getDimensionColumns( AnalyticsTable table ) return columns; } - - @Override - public List getDataYears( Date earliest ) - { - return null; // Not relevant - } @Override @Async diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java index a28b2abe..fd761961 100644 --- a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java +++ b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java @@ -69,40 +69,30 @@ public class JdbcEventAnalyticsTableManager extends AbstractJdbcTableManager { private static final Set NO_INDEX_VAL_TYPES = ImmutableSet.of( ValueType.TEXT, ValueType.LONG_TEXT ); - + @Override @Transactional public List getTables( Date earliest ) { - log.info( "Get tables using earliest: " + earliest + ", spatial support: " + databaseInfo.isSpatialSupport() ); - - return getTables( getDataYears( earliest ) ); - } + log.info( String.format( "Get tables using earliest: %s, spatial support: %b", earliest, databaseInfo.isSpatialSupport() ) ); - @Override - @Transactional - public List getAllTables() - { - return getTables( ListUtils.getClosedOpenList( 1500, 2100 ) ); - } - - private List getTables( List dataYears ) - { List tables = new UniqueArrayList<>(); Calendar calendar = PeriodType.getCalendar(); - - Collections.sort( dataYears ); String baseName = getTableName(); - - for ( Integer year : dataYears ) + + List programs = idObjectManager.getAllNoAcl( Program.class ); + + for ( Program program : programs ) { - Period period = PartitionUtils.getPeriod( calendar, year ); - - List programs = idObjectManager.getAllNoAcl( Program.class ); + List dataYears = getDataYears( program, earliest ); + + Collections.sort( dataYears ); - for ( Program program : programs ) + for ( Integer year : dataYears ) { + Period period = PartitionUtils.getPeriod( calendar, year ); + AnalyticsTable table = new AnalyticsTable( baseName, null, period, program ); List dimensionColumns = getDimensionColumns( table ); table.setDimensionColumns( dimensionColumns ); @@ -113,6 +103,13 @@ private List getTables( List dataYears ) return tables; } + @Override + @Transactional + public List getAllTables() + { + return getTables( ListUtils.getClosedOpenList( 1500, 2100 ) ); + } + @Override public String validState() { @@ -359,14 +356,15 @@ public List getDimensionColumns( AnalyticsTable table ) return columns; } - - @Override - public List getDataYears( Date earliest ) + + private List getDataYears( Program program, Date earliest ) { String sql = "select distinct(extract(year from psi.executiondate)) " + "from programstageinstance psi " + - "where psi.executiondate is not null "; + "inner join programinstance pi on psi.programinstanceid = pi.programinstanceid " + + "where pi.programid = " + program.getId() + " " + + "and psi.executiondate is not null"; if ( earliest != null ) { @@ -375,7 +373,7 @@ public List getDataYears( Date earliest ) return jdbcTemplate.queryForList( sql, Integer.class ); } - + @Override @Async public Future applyAggregationLevels( ConcurrentLinkedQueue tables, diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcOrgUnitTargetTableManager.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcOrgUnitTargetTableManager.java index 226f1f0c..b37fc3e6 100644 --- a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcOrgUnitTargetTableManager.java +++ b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcOrgUnitTargetTableManager.java @@ -59,7 +59,7 @@ public List getTables( Date earliest ) @Override public List getAllTables() { - return getTables( null ); + return getTables( new Date() ); } @Override @@ -169,12 +169,6 @@ public List getDimensionColumns( AnalyticsTable table ) return columns; } - - @Override - public List getDataYears( Date earliest ) - { - return null; // Not relevant - } @Override @Async From c713160dd9bc41a971fb197d8254cc41ddcd7586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= Date: Thu, 30 Mar 2017 14:21:18 +0200 Subject: [PATCH 08/31] Mapview startup fix (cherry picked from commit 8dd8a2e62c7404d23648f3a3a63c75100f7bbd72) --- .../src/main/java/org/hisp/dhis/startup/TableAlteror.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java index 31dbcf64..9282f90d 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java +++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java @@ -1449,8 +1449,8 @@ private void updateOptions() private void upgradeMapViewsToColumns() { String sql = - "insert into mapview_columns " + - "select mapviewid, 'dx', 0 " + + "insert into mapview_columns(mapviewid, sort_order, dimension) " + + "select mapviewid, 0, 'dx' " + "from mapview mv " + "where not exists (" + "select mc.mapviewid " + From 5567d99972c047046b7f3d7e74474d82a487edee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= Date: Thu, 30 Mar 2017 17:23:04 +0200 Subject: [PATCH 09/31] Performance improvement in org unit query by groups (cherry picked from commit ba357238f0bb2f94969e8ce4c934769cafd3b058) --- .../HibernateOrganisationUnitStore.java | 25 ++++++--------- .../OrganisationUnitStoreTest.java | 31 ++++++++++++------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java index a009d9c0..b69a3060 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java +++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java @@ -35,13 +35,13 @@ import org.hibernate.Session; import org.hibernate.criterion.Restrictions; import org.hisp.dhis.common.AuditLogUtil; +import org.hisp.dhis.common.IdentifiableObjectUtils; import org.hisp.dhis.common.SetMap; import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore; import org.hisp.dhis.commons.util.SqlHelper; import org.hisp.dhis.commons.util.TextUtils; import org.hisp.dhis.dbms.DbmsManager; import org.hisp.dhis.organisationunit.OrganisationUnit; -import org.hisp.dhis.organisationunit.OrganisationUnitGroup; import org.hisp.dhis.organisationunit.OrganisationUnitHierarchy; import org.hisp.dhis.organisationunit.OrganisationUnitQueryParams; import org.hisp.dhis.organisationunit.OrganisationUnitStore; @@ -128,8 +128,13 @@ public List getOrganisationUnits( OrganisationUnitQueryParams { SqlHelper hlp = new SqlHelper(); - String hql = "select o from OrganisationUnit o "; + String hql = "select distinct o from OrganisationUnit o "; + if ( params.hasGroups() ) + { + hql += "join o.groups og "; + } + if ( params.hasQuery() ) { hql += hlp.whereAnd() + " (lower(o.name) like :queryLower or o.code = :query or o.uid = :query) "; @@ -149,14 +154,7 @@ public List getOrganisationUnits( OrganisationUnitQueryParams if ( params.hasGroups() ) { - hql += hlp.whereAnd() + " ("; - - for ( OrganisationUnitGroup group : params.getGroups() ) - { - hql += " :" + group.getUid() + " in elements(o.groups) or "; - } - - hql = TextUtils.removeLastOr( hql ) + ") "; + hql += hlp.whereAnd() + " og.id in (:groupIds) "; } if ( params.hasLevels() ) @@ -189,12 +187,9 @@ public List getOrganisationUnits( OrganisationUnitQueryParams if ( params.hasGroups() ) { - for ( OrganisationUnitGroup group : params.getGroups() ) - { - query.setEntity( group.getUid(), group ); - } + query.setParameterList( "groupIds", IdentifiableObjectUtils.getIdentifiers( params.getGroups() ) ); } - + if ( params.hasLevels() ) { query.setParameterList( "levels", params.getLevels() ); diff --git a/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitStoreTest.java b/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitStoreTest.java index 080e1295..3e8960ae 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitStoreTest.java +++ b/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitStoreTest.java @@ -70,6 +70,7 @@ public class OrganisationUnitStoreTest private OrganisationUnit ouG; private OrganisationUnitGroup ougA; + private OrganisationUnitGroup ougB; private DataElementCategoryOption coA; private DataElementCategoryOption coB; @@ -90,6 +91,7 @@ public void setUpTest() ouG = createOrganisationUnit( 'G', ouC ); // 3 ougA = createOrganisationUnitGroup( 'A' ); + ougB = createOrganisationUnitGroup( 'B' ); coA = createCategoryOption( 'A' ); coB = createCategoryOption( 'B' ); @@ -130,13 +132,10 @@ public void testGetOrganisationUnits() orgUnitStore.save( ouF ); orgUnitStore.save( ouG ); - OrganisationUnitGroup ogA = createOrganisationUnitGroup( 'A' ); - ogA.getMembers().addAll( Sets.newHashSet( ouD, ouF ) ); - OrganisationUnitGroup ogB = createOrganisationUnitGroup( 'B' ); - ogB.getMembers().addAll( Sets.newHashSet( ouE, ouG ) ); - - orgUnitGroupStore.save( ogA ); - orgUnitGroupStore.save( ogB ); + ougA.getMembers().addAll( Sets.newHashSet( ouD, ouF ) ); + ougB.getMembers().addAll( Sets.newHashSet( ouE, ouG ) ); + orgUnitGroupStore.save( ougA ); + orgUnitGroupStore.save( ougB ); // Query @@ -171,7 +170,7 @@ public void testGetOrganisationUnits() // Groups params = new OrganisationUnitQueryParams(); - params.setGroups( Sets.newHashSet( ogA ) ); + params.setGroups( Sets.newHashSet( ougA ) ); ous = orgUnitStore.getOrganisationUnits( params ); @@ -179,9 +178,17 @@ public void testGetOrganisationUnits() assertTrue( ous.containsAll( Sets.newHashSet( ouD, ouF ) ) ); // Groups - + + params = new OrganisationUnitQueryParams(); + params.setGroups( Sets.newHashSet( ougA ) ); + + ous = orgUnitStore.getOrganisationUnits( params ); + + assertEquals( 2, ous.size() ); + assertTrue( ous.containsAll( Sets.newHashSet( ouD, ouF ) ) ); + params = new OrganisationUnitQueryParams(); - params.setGroups( Sets.newHashSet( ogA, ogB ) ); + params.setGroups( Sets.newHashSet( ougA, ougB ) ); ous = orgUnitStore.getOrganisationUnits( params ); @@ -212,7 +219,7 @@ public void testGetOrganisationUnits() params = new OrganisationUnitQueryParams(); params.setLevels( Sets.newHashSet( 3 ) ); - params.setGroups( Sets.newHashSet( ogA ) ); + params.setGroups( Sets.newHashSet( ougA ) ); ous = orgUnitStore.getOrganisationUnits( params ); @@ -223,7 +230,7 @@ public void testGetOrganisationUnits() params = new OrganisationUnitQueryParams(); params.setParents( Sets.newHashSet( ouC ) ); - params.setGroups( Sets.newHashSet( ogB ) ); + params.setGroups( Sets.newHashSet( ougB ) ); ous = orgUnitStore.getOrganisationUnits( params ); From 78daa65b489aacc61b743a9224eb9c0c4f71316d Mon Sep 17 00:00:00 2001 From: abyot Date: Mon, 3 Apr 2017 09:41:53 +0200 Subject: [PATCH 10/31] no custom registration form for programs without registration --- .../main/webapp/dhis-web-maintenance-program/programList.vm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm index eefda968..b406cc6a 100644 --- a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm +++ b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm @@ -7,10 +7,10 @@
  •   $i18n.getString( "sharing_settings" )
  •   $i18n.getString( "edit" )
  •   $i18n.getString( "assign_program_to_orgunits" )
    • -
  •   $i18n.getString( "design_custom_registration_form" )
    • +
  •   $i18n.getString( "design_custom_registration_form" )
  •   $i18n.getString( "view_program_stages" )
  •   $i18n.getString( "view_program_indicators" )
    • -
  •   $i18n.getString( "view_program_rule" )
    • +
  •   $i18n.getString( "view_program_rule" )
  •   $i18n.getString( "view_validation_rules" )
  •   $i18n.getString( "view_program_notifications" )
    • @@ -47,7 +47,7 @@ Date: Mon, 3 Apr 2017 16:06:43 +0200 Subject: [PATCH 11/31] Added chart/event chart subtitle persisted property --- .../hisp/dhis/common/BaseAnalyticalObject.java | 16 ++++++++++++++++ .../org/hisp/dhis/chart/hibernate/Chart.hbm.xml | 2 ++ .../org/hisp/dhis/eventchart/EventChart.hbm.xml | 2 ++ 3 files changed, 20 insertions(+) diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java index aefb8d38..d7ea613d 100644 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java +++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java @@ -144,6 +144,8 @@ public abstract class BaseAnalyticalObject protected String title; + protected String subtitle; + protected Set interpretations = new HashSet<>(); // ------------------------------------------------------------------------- @@ -853,12 +855,14 @@ public void mergeWith( IdentifiableObject other, MergeMode mergeMode ) relatives = object.getRelatives(); aggregationType = object.getAggregationType(); title = object.getTitle(); + subtitle = object.getSubtitle(); } else if ( mergeMode.isMerge() ) { relatives = object.getRelatives() == null ? relatives : object.getRelatives(); aggregationType = object.getAggregationType() == null ? aggregationType : object.getAggregationType(); title = object.getTitle() == null ? title : object.getTitle(); + subtitle = object.getSubtitle() == null ? subtitle : object.getSubtitle(); } dataDimensionItems.addAll( object.getDataDimensionItems() ); @@ -1167,6 +1171,18 @@ public void setTitle( String title ) this.title = title; } + @JsonProperty + @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) + public String getSubtitle() + { + return subtitle; + } + + public void setSubtitle( String subtitle ) + { + this.subtitle = subtitle; + } + @JsonProperty @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JacksonXmlElementWrapper( localName = "interpretations", namespace = DxfNamespaces.DXF_2_0 ) diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml b/dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml index e5783863..ff9ab26b 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml @@ -156,6 +156,8 @@ + + diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/eventchart/EventChart.hbm.xml b/dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/eventchart/EventChart.hbm.xml index 08910729..8a3a5844 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/eventchart/EventChart.hbm.xml +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/eventchart/EventChart.hbm.xml @@ -116,6 +116,8 @@ + + From a0928f5c26f558fc83ee9df40777aaa3b553542b Mon Sep 17 00:00:00 2001 From: vietnguyen Date: Tue, 4 Apr 2017 14:02:10 +0700 Subject: [PATCH 12/31] remove ProgramValidation (#683) --- .../hisp/dhis/program/ProgramValidation.java | 160 ---------- .../dhis/program/ProgramValidationResult.java | 184 ------------ .../program/ProgramValidationService.java | 105 ------- .../dhis/program/ProgramValidationStore.java | 51 ---- .../DefaultProgramValidationService.java | 257 ---------------- .../ProgramValidationDeletionHandler.java | 75 ----- .../HibernateProgramValidationStore.java | 52 ---- .../dhis/schema/DefaultSchemaService.java | 1 - .../ProgramValidationSchemaDescriptor.java | 61 ---- .../org/hisp/dhis/startup/TableAlteror.java | 3 +- .../trackedentity/startup/TableAlteror.java | 6 - .../main/resources/META-INF/dhis/beans.xml | 20 -- .../hibernate/ProgramValidation.hbm.xml | 40 --- .../program/ProgramValidationServiceTest.java | 279 ------------------ .../program/ProgramValidationStoreTest.java | 145 --------- .../org/hisp/dhis/dxf2/metadata/Metadata.java | 16 - .../dhis/system/deletion/DeletionHandler.java | 12 +- .../event/ProgramValidationController.java | 45 --- .../javascripts/validationRules.js | 15 - .../AddProgramValidationAction.java | 149 ---------- .../GetProgramValidationAction.java | 120 -------- .../GetProgramValidationListAction.java | 109 ------- .../RemoveProgramValidationAction.java | 84 ------ .../UpdateProgramValidationAction.java | 145 --------- .../main/resources/META-INF/dhis/beans.xml | 54 ---- .../src/main/resources/struts.xml | 68 ----- .../addSingleProgramValidationForm.vm | 73 ----- .../javascript/program.js | 4 - .../javascript/programValidation.js | 211 ------------- .../programList.vm | 1 - .../programValidationList.vm | 91 ------ .../updateSingleProgramValidationForm.vm | 77 ----- 32 files changed, 2 insertions(+), 2711 deletions(-) delete mode 100644 dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidation.java delete mode 100644 dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationResult.java delete mode 100644 dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationService.java delete mode 100644 dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationStore.java delete mode 100644 dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java delete mode 100644 dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramValidationDeletionHandler.java delete mode 100644 dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java delete mode 100644 dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/ProgramValidationSchemaDescriptor.java delete mode 100644 dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramValidation.hbm.xml delete mode 100644 dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.java delete mode 100644 dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramValidationStoreTest.java delete mode 100644 dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramValidationController.java delete mode 100644 dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/AddProgramValidationAction.java delete mode 100644 dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/GetProgramValidationAction.java delete mode 100644 dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/GetProgramValidationListAction.java delete mode 100644 dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/RemoveProgramValidationAction.java delete mode 100644 dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/UpdateProgramValidationAction.java delete mode 100644 dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addSingleProgramValidationForm.vm delete mode 100644 dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programValidation.js delete mode 100644 dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programValidationList.vm delete mode 100644 dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidation.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidation.java deleted file mode 100644 index 69b4e282..00000000 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidation.java +++ /dev/null @@ -1,160 +0,0 @@ -package org.hisp.dhis.program; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import org.hisp.dhis.common.BaseIdentifiableObject; -import org.hisp.dhis.common.DxfNamespaces; -import org.hisp.dhis.common.IdentifiableObject; -import org.hisp.dhis.common.MergeMode; -import org.hisp.dhis.expression.Operator; - -/** - * @author Chau Thu Tran - */ -@JacksonXmlRootElement( localName = "programValidation", namespace = DxfNamespaces.DXF_2_0 ) -public class ProgramValidation - extends BaseIdentifiableObject -{ - public static final String SEPARATOR_OBJECT = ":"; - - public static String OBJECT_PROGRAM_STAGE_DATAELEMENT = "DE"; - - // ------------------------------------------------------------------------- - // Fields - // ------------------------------------------------------------------------- - - private ProgramExpression leftSide; - - private Operator operator; - - private ProgramExpression rightSide; - - private Program program; - - // ------------------------------------------------------------------------- - // Constructor - // ------------------------------------------------------------------------- - - public ProgramValidation() - { - - } - - public ProgramValidation( String name, ProgramExpression leftSide, ProgramExpression rightSide, - Program program ) - { - this.name = name; - this.leftSide = leftSide; - this.rightSide = rightSide; - this.program = program; - } - - // ------------------------------------------------------------------------- - // Getters && Setters - // ------------------------------------------------------------------------- - - @JsonProperty - @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) - public ProgramExpression getLeftSide() - { - return leftSide; - } - - public void setLeftSide( ProgramExpression leftSide ) - { - this.leftSide = leftSide; - } - - @JsonProperty - @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) - public ProgramExpression getRightSide() - { - return rightSide; - } - - public void setRightSide( ProgramExpression rightSide ) - { - this.rightSide = rightSide; - } - - @JsonProperty - @JsonSerialize( as = BaseIdentifiableObject.class ) - @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) - public Program getProgram() - { - return program; - } - - public void setProgram( Program program ) - { - this.program = program; - } - - @JsonProperty - @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) - public Operator getOperator() - { - return operator; - } - - public void setOperator( Operator operator ) - { - this.operator = operator; - } - - @Override - public void mergeWith( IdentifiableObject other, MergeMode mergeMode ) - { - super.mergeWith( other, mergeMode ); - - if ( other.getClass().isInstance( this ) ) - { - ProgramValidation programValidation = (ProgramValidation) other; - - if ( mergeMode.isReplace() ) - { - leftSide = programValidation.getLeftSide(); - operator = programValidation.getOperator(); - rightSide = programValidation.getRightSide(); - program = programValidation.getProgram(); - } - else if ( mergeMode.isMerge() ) - { - leftSide = programValidation.getLeftSide() == null ? leftSide : programValidation.getLeftSide(); - rightSide = programValidation.getRightSide() == null ? rightSide : programValidation.getRightSide(); - operator = programValidation.getOperator() == null ? operator : programValidation.getOperator(); - program = programValidation.getProgram() == null ? program : programValidation.getProgram(); - } - } - } -} diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationResult.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationResult.java deleted file mode 100644 index 074bdfbd..00000000 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationResult.java +++ /dev/null @@ -1,184 +0,0 @@ -package org.hisp.dhis.program; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import org.hisp.dhis.common.BaseIdentifiableObject; -import org.hisp.dhis.common.DxfNamespaces; - -/** - * @author Chau Thu Tran - */ -@JacksonXmlRootElement( localName = "programValidationResult", namespace = DxfNamespaces.DXF_2_0 ) -public class ProgramValidationResult -{ - private ProgramStageInstance programStageInstance; - - private ProgramValidation programValidation; - - private String leftsideValue; - - private String rightsideValue; - - // ------------------------------------------------------------------------- - // Constructors - // ------------------------------------------------------------------------- - - public ProgramValidationResult() - { - } - - public ProgramValidationResult( ProgramStageInstance programStageInstance, ProgramValidation programValidation, - String leftsideValue, String rightsideValue ) - { - super(); - this.programStageInstance = programStageInstance; - this.programValidation = programValidation; - this.leftsideValue = leftsideValue; - this.rightsideValue = rightsideValue; - } - - // ------------------------------------------------------------------------- - // Equals, hashCode and toString - // ------------------------------------------------------------------------- - - @Override - public int hashCode() - { - final int prime = 31; - int result = 1; - result = prime * result + ((programStageInstance == null) ? 0 : programStageInstance.hashCode()); - result = prime * result + ((programValidation == null) ? 0 : programValidation.hashCode()); - return result; - } - - @Override - public boolean equals( Object object ) - { - if ( this == object ) - { - return true; - } - - if ( object == null ) - { - return false; - } - - if ( getClass() != object.getClass() ) - { - return false; - } - - final ProgramValidationResult other = (ProgramValidationResult) object; - - if ( programStageInstance == null ) - { - if ( other.programStageInstance != null ) - { - return false; - } - } - else if ( !programStageInstance.equals( other.programStageInstance ) ) - { - return false; - } - - if ( programValidation == null ) - { - if ( other.programValidation != null ) - { - return false; - } - } - else if ( !programValidation.equals( other.programValidation ) ) - { - return false; - } - - return true; - } - - // ------------------------------------------------------------------------- - // Setters && Getters - // ------------------------------------------------------------------------- - - @JsonProperty - @JsonSerialize( as = BaseIdentifiableObject.class ) - @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) - public ProgramStageInstance getProgramStageInstance() - { - return programStageInstance; - } - - public void setProgramStageInstance( ProgramStageInstance programStageInstance ) - { - this.programStageInstance = programStageInstance; - } - - @JsonProperty - @JsonSerialize( as = BaseIdentifiableObject.class ) - @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) - public ProgramValidation getProgramValidation() - { - return programValidation; - } - - public void setProgramValidation( ProgramValidation programValidation ) - { - this.programValidation = programValidation; - } - - @JsonProperty - @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) - public String getLeftsideValue() - { - return leftsideValue; - } - - public void setLeftsideValue( String leftsideValue ) - { - this.leftsideValue = leftsideValue; - } - - @JsonProperty - @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) - public String getRightsideValue() - { - return rightsideValue; - } - - public void setRightsideValue( String rightsideValue ) - { - this.rightsideValue = rightsideValue; - } -} diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationService.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationService.java deleted file mode 100644 index 6b15e1ca..00000000 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationService.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.hisp.dhis.program; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import java.util.Collection; -import java.util.List; - -/** - * @author Chau Thu Tran - * @version $ ProgramValidationService.java Apr 28, 2011 10:32:20 AM $ - */ -public interface ProgramValidationService -{ - String ID = ProgramValidationService.class.getName(); - - /** - * Adds an {@link ProgramValidation} - * - * @param programValidation The to ProgramValidation add. - * @return A generated unique id of the added {@link ProgramValidation}. - */ - int addProgramValidation( ProgramValidation programValidation ); - - /** - * Deletes a {@link ProgramValidation} - * - * @param programValidation The ProgramValidation to delete. - */ - void deleteProgramValidation( ProgramValidation programValidation ); - - /** - * Updates an {@link ProgramValidation}. - * - * @param programValidation The ProgramValidation to update. - */ - void updateProgramValidation( ProgramValidation programValidation ); - - /** - * Returns a {@link ProgramValidation}. - * - * @param id the id of the ProgramValidation to return. - * @return the ProgramValidation with the given id - */ - ProgramValidation getProgramValidation( int id ); - - /** - * Returns all {@link ProgramValidation}. - * - * @return a collection of all ProgramValidation, or an empty collection if - * there are no ProgramValidations. - */ - List getAllProgramValidation(); - - /** - * Get validation by {@link Program} - * - * @param program Program - * @return ProgramValidation list - */ - List getProgramValidation( Program program ); - - /** - * Get validation by program stage - * - * @param programStage {@link ProgramStage} - * @return ProgramValidation list - */ - List getProgramValidation( ProgramStage programStage ); - - /** - * Get validation violated in an event - * - * @param validation ProgramValidation List - * @param programStageInstance {@link ProgramStageInstance} - * @return List of validation violated - */ - List validate( Collection validation, - ProgramStageInstance programStageInstance ); -} diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationStore.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationStore.java deleted file mode 100644 index ac022609..00000000 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationStore.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.hisp.dhis.program; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import java.util.List; - -import org.hisp.dhis.common.GenericStore; - -/** - * @author Chau Thu Tran - * @version $ ProgramValidationStore.java Apr 28, 2011 10:33:44 AM $ - */ -public interface ProgramValidationStore - extends GenericStore -{ - String ID = ProgramValidation.class.getName(); - - /** - * Get validation by program - * - * @param program {@link Program} - * @return ProgramValidation list - */ - List get( Program program ); -} diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java deleted file mode 100644 index 83c3c9f1..00000000 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java +++ /dev/null @@ -1,257 +0,0 @@ -package org.hisp.dhis.program; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import org.apache.commons.math3.util.MathUtils; -import org.hisp.dhis.dataelement.DataElement; -import org.hisp.dhis.trackedentitydatavalue.TrackedEntityDataValue; -import org.hisp.dhis.trackedentitydatavalue.TrackedEntityDataValueService; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static org.hisp.dhis.program.ProgramExpression.*; - -/** - * @author Chau Thu Tran - */ -@Transactional -public class DefaultProgramValidationService - implements ProgramValidationService -{ - private final String regExp = "\\[(" + OBJECT_PROGRAM_STAGE_DATAELEMENT + "|" + OBJECT_PROGRAM_STAGE + ")" - + SEPARATOR_OBJECT + "([a-zA-Z0-9\\- ]+[" + SEPARATOR_ID + "[a-zA-Z0-9\\- ]*]*)" + "\\]"; - - private ProgramValidationStore validationStore; - - public void setValidationStore( ProgramValidationStore validationStore ) - { - this.validationStore = validationStore; - } - - private ProgramExpressionService expressionService; - - public void setExpressionService( ProgramExpressionService expressionService ) - { - this.expressionService = expressionService; - } - - private TrackedEntityDataValueService dataValueService; - - public void setDataValueService( TrackedEntityDataValueService dataValueService ) - { - this.dataValueService = dataValueService; - } - - // ------------------------------------------------------------------------- - // Implementation methods - // ------------------------------------------------------------------------- - @Override - public int addProgramValidation( ProgramValidation programValidation ) - { - return validationStore.save( programValidation ); - } - - @Override - public void updateProgramValidation( ProgramValidation programValidation ) - { - validationStore.update( programValidation ); - } - - @Override - public void deleteProgramValidation( ProgramValidation programValidation ) - { - validationStore.delete( programValidation ); - } - - @Override - public List getAllProgramValidation() - { - return validationStore.getAll(); - } - - @Override - public ProgramValidation getProgramValidation( int id ) - { - return validationStore.get( id ); - } - - @Override - public List validate( Collection validation, - ProgramStageInstance programStageInstance ) - { - List result = new ArrayList<>(); - - // --------------------------------------------------------------------- - // Get data-values - // --------------------------------------------------------------------- - - Program program = programStageInstance.getProgramInstance().getProgram(); - Collection entityInstanceDataValues = null; - if ( program.isWithoutRegistration() ) - { - entityInstanceDataValues = dataValueService.getTrackedEntityDataValues( programStageInstance ); - } - else - { - entityInstanceDataValues = dataValueService.getTrackedEntityDataValues( programStageInstance.getProgramInstance() - .getProgramStageInstances() ); - } - - Map entityInstanceDataValueMap = new HashMap<>( entityInstanceDataValues.size() ); - for ( TrackedEntityDataValue entityInstanceDataValue : entityInstanceDataValues ) - { - String key = entityInstanceDataValue.getProgramStageInstance().getProgramStage().getUid() + "." - + entityInstanceDataValue.getDataElement().getUid(); - entityInstanceDataValueMap.put( key, entityInstanceDataValue.getValue() ); - } - - // --------------------------------------------------------------------- - // Validate rules - // --------------------------------------------------------------------- - - for ( ProgramValidation validate : validation ) - { - String leftSideValue = expressionService.getProgramExpressionValue( validate.getLeftSide(), - programStageInstance, entityInstanceDataValueMap ); - String rightSideValue = expressionService.getProgramExpressionValue( validate.getRightSide(), - programStageInstance, entityInstanceDataValueMap ); - String operator = validate.getOperator().getMathematicalOperator(); - - if ( leftSideValue != null && rightSideValue != null ) - { - String expression = validate.getLeftSide().getExpression() + " " + validate.getRightSide().getExpression(); - if ( isNumberDataExpression( expression ) ) - { - double leftSide = Double.parseDouble( leftSideValue ); - double rightSide = Double.parseDouble( rightSideValue ); - if ( !((operator.equals( "==" ) && MathUtils.equals( leftSide, rightSide ) ) - || (operator.equals( "<" ) && leftSide < rightSide) - || (operator.equals( "<=" ) && leftSide <= rightSide) - || (operator.equals( ">" ) && leftSide > rightSide) - || (operator.equals( ">=" ) && leftSide >= rightSide) || (operator.equals( "!=" ) && !MathUtils.equals( leftSide, rightSide ) )) ) - { - ProgramValidationResult validationResult = new ProgramValidationResult( programStageInstance, - validate, leftSideValue, rightSideValue ); - result.add( validationResult ); - } - } - else if ( !((operator.equals( "==" ) && leftSideValue.compareTo( rightSideValue ) == 0) - || (operator.equals( "<" ) && leftSideValue.compareTo( rightSideValue ) < 0) - || (operator.equals( "<=" ) && (leftSideValue.compareTo( rightSideValue ) <= 0)) - || (operator.equals( ">" ) && leftSideValue.compareTo( rightSideValue ) > 0) - || (operator.equals( ">=" ) && leftSideValue.compareTo( rightSideValue ) >= 0) || (operator - .equals( "!=" ) && leftSideValue.compareTo( rightSideValue ) == 0)) ) - { - ProgramValidationResult validationResult = new ProgramValidationResult( programStageInstance, - validate, leftSideValue, rightSideValue ); - result.add( validationResult ); - } - } - } - - return result; - } - - @Override - public List getProgramValidation( Program program ) - { - return validationStore.get( program ); - } - - @Override - public List getProgramValidation( ProgramStage programStage ) - { - List programValidation = getProgramValidation( programStage.getProgram() ); - - Iterator iter = programValidation.iterator(); - - Pattern pattern = Pattern.compile( regExp ); - - while ( iter.hasNext() ) - { - ProgramValidation validation = iter.next(); - - String expression = validation.getLeftSide().getExpression() + " " - + validation.getRightSide().getExpression(); - Matcher matcher = pattern.matcher( expression ); - - boolean flag = false; - while ( matcher.find() ) - { - String match = matcher.group(); - match = match.replaceAll( "[\\[\\]]", "" ); - - String[] info = match.split( SEPARATOR_OBJECT ); - String[] ids = info[1].split( SEPARATOR_ID ); - - String programStageUid = ids[0]; - - if ( programStageUid.equals( programStage.getUid() ) ) - { - flag = true; - break; - } - } - - if ( !flag ) - { - iter.remove(); - } - } - - return programValidation; - } - - // ------------------------------------------------------------------------- - // Supportive methods - // ------------------------------------------------------------------------- - - private boolean isNumberDataExpression( String programExpression ) - { - Collection dataElements = expressionService.getDataElements( programExpression ); - - for ( DataElement dataElement : dataElements ) - { - if ( dataElement.getValueType().isNumeric() ) - { - return true; - } - } - - return false; - } -} diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramValidationDeletionHandler.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramValidationDeletionHandler.java deleted file mode 100644 index 0cde78c6..00000000 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramValidationDeletionHandler.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.hisp.dhis.program; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import java.util.Collection; - -import org.hisp.dhis.system.deletion.DeletionHandler; - -/** - * @author Chau Thu Tran - */ -public class ProgramValidationDeletionHandler - extends DeletionHandler -{ - // ------------------------------------------------------------------------- - // Dependencies - // ------------------------------------------------------------------------- - - private ProgramValidationService programValidationService; - - public void setProgramValidationService( ProgramValidationService programValidationService ) - { - this.programValidationService = programValidationService; - } - - // ------------------------------------------------------------------------- - // DeletionHandler implementation - // ------------------------------------------------------------------------- - - @Override - public String getClassName() - { - return ProgramValidation.class.getSimpleName(); - } - - @Override - public void deleteProgram( Program program ) - { - Collection programValidation = programValidationService.getAllProgramValidation(); - - for ( ProgramValidation validation : programValidation ) - { - if ( program.equals( validation.getProgram() ) ) - { - programValidationService.deleteProgramValidation( validation ); - } - } - } -} diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java deleted file mode 100644 index 08b4a3cc..00000000 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.hisp.dhis.program.hibernate; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import java.util.List; - -import org.hibernate.criterion.Restrictions; -import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore; -import org.hisp.dhis.program.Program; -import org.hisp.dhis.program.ProgramValidation; -import org.hisp.dhis.program.ProgramValidationStore; - -/** - * @author Chau Thu Tran - */ -public class HibernateProgramValidationStore - extends HibernateIdentifiableObjectStore - implements ProgramValidationStore -{ - @Override - @SuppressWarnings( "unchecked" ) - public List get( Program program ) - { - return getCriteria( Restrictions.eq( "program", program ) ).list(); - } -} diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java index f13879a0..98c47a30 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java +++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java @@ -120,7 +120,6 @@ public class DefaultSchemaService add( new ProgramStageSectionSchemaDescriptor() ). add( new ProgramTrackedEntityAttributeSchemaDescriptor() ). add( new ProgramNotificationTemplateSchemaDescriptor() ). - add( new ProgramValidationSchemaDescriptor() ). add( new RelationshipTypeSchemaDescriptor() ). add( new ReportSchemaDescriptor() ). add( new ReportTableSchemaDescriptor() ). diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/ProgramValidationSchemaDescriptor.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/ProgramValidationSchemaDescriptor.java deleted file mode 100644 index 550fc505..00000000 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors/ProgramValidationSchemaDescriptor.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.hisp.dhis.schema.descriptors; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import com.google.common.collect.Lists; -import org.hisp.dhis.program.ProgramValidation; -import org.hisp.dhis.security.Authority; -import org.hisp.dhis.security.AuthorityType; -import org.hisp.dhis.schema.Schema; -import org.hisp.dhis.schema.SchemaDescriptor; - -/** - * @author Morten Olav Hansen - */ -public class ProgramValidationSchemaDescriptor implements SchemaDescriptor -{ - public static final String SINGULAR = "programValidation"; - - public static final String PLURAL = "programValidations"; - - public static final String API_ENDPOINT = "/" + PLURAL; - - @Override - public Schema getSchema() - { - Schema schema = new Schema( ProgramValidation.class, SINGULAR, PLURAL ); - schema.setRelativeApiEndpoint( API_ENDPOINT ); - schema.setOrder( 1530 ); - - schema.getAuthorities().add( new Authority( AuthorityType.CREATE, Lists.newArrayList( "F_PROGRAM_VALIDATION" ) ) ); - schema.getAuthorities().add( new Authority( AuthorityType.DELETE, Lists.newArrayList( "F_PROGRAM_VALIDATION" ) ) ); - - return schema; - } -} diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java index 9282f90d..5b95e7f6 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java +++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java @@ -1506,7 +1506,7 @@ private void updateObjectTranslation() List> listTables = new ArrayList<>(); addTranslationTable( listTables, "DataElement", "dataelementtranslations", "dataelement", "dataelementid" ); - addTranslationTable( listTables, "DataElementCategory", "dataelementcategorytranslations", "dataelementcategory", "categoryid" ); + addTranslationTable( listTables, "DataElementCategory", "dataelementcategorytranslations", "dataelementcategory", "categoryid" ); addTranslationTable( listTables, "Attribute", "attributetranslations", "attribute", "attributeid" ); addTranslationTable( listTables, "Indicator", "indicatortranslations", "indicator", "indicatorid" ); addTranslationTable( listTables, "OrganisationUnit", "organisationUnittranslations", "organisationunit", "organisationunitid" ); @@ -1563,7 +1563,6 @@ private void updateObjectTranslation() addTranslationTable( listTables, "ProgramStageInstance", "programstageinstancetranslations", "programstageinstance", "programstageinstanceid" ); addTranslationTable( listTables, "ProgramStageSection", "programstagesectiontranslations", "programstagesection", "programstagesectionid" ); addTranslationTable( listTables, "ProgramTrackedEntityAttribute", "programattributestranslations", "programtrackedentityattribute", "programtrackedentityattributeid" ); - addTranslationTable( listTables, "ProgramValidation", "programvalidationtranslations", "programvalidation", "programvalidationid" ); addTranslationTable( listTables, "ProgramRule", "programruletranslations", "programrule", "programruleid" ); addTranslationTable( listTables, "ProgramRuleAction", "programruleactiontranslations", "programruleaction", "programruleactionid" ); addTranslationTable( listTables, "ProgramRuleVariable", "programrulevariabletranslations", "programrulevariable", "programrulevariableid" ); diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java index b13677fa..949c760e 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java +++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java @@ -125,17 +125,11 @@ public void execute() executeSql( "UPDATE program SET programstage_dataelements=false WHERE displayInReports is null" ); - executeSql( "ALTER TABLE programvalidation DROP COLUMN leftside" ); - executeSql( "ALTER TABLE programvalidation DROP COLUMN rightside" ); - executeSql( "ALTER TABLE programvalidation DROP COLUMN dateType" ); - executeSql( "UPDATE programstage SET validCompleteOnly=false WHERE validCompleteOnly is null" ); executeSql( "UPDATE program SET ignoreOverdueEvents=false WHERE ignoreOverdueEvents is null" ); executeSql( "UPDATE programstage SET displayGenerateEventBox=true WHERE displayGenerateEventBox is null" ); - executeSql( "ALTER TABLE programvalidation RENAME description TO name" ); - executeSql( "UPDATE program SET blockEntryForm=false WHERE blockEntryForm is null" ); executeSql( "ALTER TABLE dataset DROP CONSTRAINT program_name_key" ); executeSql( "UPDATE userroleauthorities SET authority='F_PROGRAM_PUBLIC_ADD' WHERE authority='F_PROGRAM_ADD'" ); diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml b/dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml index 64bdb148..1ed907a3 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml @@ -587,12 +587,6 @@ - - - - - @@ -1365,12 +1359,6 @@ - - - - - - @@ -1563,7 +1551,6 @@ programstageinstance programstagesection program_attributes - programvalidation programrule programruleaction programrulevariable @@ -1821,12 +1808,6 @@ - - - - @@ -1897,7 +1878,6 @@ - diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramValidation.hbm.xml b/dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramValidation.hbm.xml deleted file mode 100644 index 49a2cb9e..00000000 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramValidation.hbm.xml +++ /dev/null @@ -1,40 +0,0 @@ - -] - > - - - - - - - - &identifiableProperties; - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.java b/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.java deleted file mode 100644 index e390f199..00000000 --- a/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.java +++ /dev/null @@ -1,279 +0,0 @@ -package org.hisp.dhis.program; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.hisp.dhis.DhisSpringTest; -import org.hisp.dhis.dataelement.DataElement; -import org.hisp.dhis.dataelement.DataElementService; -import org.hisp.dhis.expression.Operator; -import org.hisp.dhis.organisationunit.OrganisationUnit; -import org.hisp.dhis.organisationunit.OrganisationUnitService; -import org.hisp.dhis.trackedentity.TrackedEntityInstance; -import org.hisp.dhis.trackedentity.TrackedEntityInstanceService; -import org.hisp.dhis.trackedentitydatavalue.TrackedEntityDataValue; -import org.hisp.dhis.trackedentitydatavalue.TrackedEntityDataValueService; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; - -/** - * @author Chau Thu Tran - */ -public class ProgramValidationServiceTest - extends DhisSpringTest -{ - @Autowired - private ProgramValidationService programValidationService; - - @Autowired - private ProgramStageInstanceService programStageInstanceService; - - @Autowired - private ProgramStageDataElementService programStageDataElementService; - - @Autowired - private OrganisationUnitService organisationUnitService; - - @Autowired - private DataElementService dataElementService; - - @Autowired - private ProgramService programService; - - @Autowired - private ProgramStageService programStageService; - - @Autowired - private TrackedEntityInstanceService entityInstanceService; - - @Autowired - private ProgramInstanceService programInstanceService; - - @Autowired - private TrackedEntityDataValueService dataValueService; - - private Program program; - - private ProgramStage stageA; - - private ProgramStage stageB; - - private ProgramStageDataElement stageDataElementA; - - private ProgramStageDataElement stageDataElementC; - - private ProgramStageInstance stageInstanceA; - - private ProgramStageInstance stageInstanceB; - - private ProgramValidation validationA; - - private ProgramValidation validationB; - - @Override - public void setUpTest() - { - OrganisationUnit organisationUnit = createOrganisationUnit( 'A' ); - organisationUnitService.addOrganisationUnit( organisationUnit ); - - program = createProgram( 'A', new HashSet<>(), organisationUnit ); - programService.addProgram( program ); - - stageA = new ProgramStage( "A", program ); - programStageService.saveProgramStage( stageA ); - - stageB = new ProgramStage( "B", program ); - programStageService.saveProgramStage( stageB ); - - Set programStages = new HashSet<>(); - programStages.add( stageA ); - programStages.add( stageB ); - program.setProgramStages( programStages ); - programService.updateProgram( program ); - - DataElement dataElementA = createDataElement( 'A' ); - DataElement dataElementB = createDataElement( 'B' ); - - dataElementService.addDataElement( dataElementA ); - dataElementService.addDataElement( dataElementB ); - - stageDataElementA = new ProgramStageDataElement( stageA, dataElementA, false, 1 ); - ProgramStageDataElement stageDataElementB = new ProgramStageDataElement( stageA, dataElementB, false, 2 ); - stageDataElementC = new ProgramStageDataElement( stageB, dataElementA, false, 1 ); - ProgramStageDataElement stageDataElementD = new ProgramStageDataElement( stageB, dataElementB, false, 2 ); - - programStageDataElementService.addProgramStageDataElement( stageDataElementA ); - programStageDataElementService.addProgramStageDataElement( stageDataElementB ); - programStageDataElementService.addProgramStageDataElement( stageDataElementC ); - programStageDataElementService.addProgramStageDataElement( stageDataElementD ); - - TrackedEntityInstance entityInstance = createTrackedEntityInstance( 'A', organisationUnit ); - entityInstanceService.addTrackedEntityInstance( entityInstance ); - - ProgramInstance programInstance = programInstanceService.enrollTrackedEntityInstance( entityInstance, program, - new Date(), new Date(), organisationUnit ); - - stageInstanceA = programStageInstanceService.createProgramStageInstance( programInstance, stageA, new Date(), - new Date(), organisationUnit ); - stageInstanceB = programStageInstanceService.createProgramStageInstance( programInstance, stageB, new Date(), - new Date(), organisationUnit ); - - Set programStageInstances = new HashSet<>(); - programStageInstances.add( stageInstanceA ); - programStageInstances.add( stageInstanceB ); - programInstance.setProgramStageInstances( programStageInstances ); - - TrackedEntityDataValue dataValueA = new TrackedEntityDataValue( stageInstanceA, dataElementA, "1" ); - TrackedEntityDataValue dataValueB = new TrackedEntityDataValue( stageInstanceA, dataElementB, "1" ); - TrackedEntityDataValue dataValueC = new TrackedEntityDataValue( stageInstanceB, dataElementA, "2" ); - TrackedEntityDataValue dataValueD = new TrackedEntityDataValue( stageInstanceB, dataElementB, "3" ); - - dataValueService.saveTrackedEntityDataValue( dataValueA ); - dataValueService.saveTrackedEntityDataValue( dataValueB ); - dataValueService.saveTrackedEntityDataValue( dataValueC ); - dataValueService.saveTrackedEntityDataValue( dataValueD ); - - ProgramExpression programExpressionA = new ProgramExpression( "[" - + ProgramExpression.OBJECT_PROGRAM_STAGE_DATAELEMENT + ProgramExpression.SEPARATOR_OBJECT + stageA.getUid() - + "." + dataElementA.getUid() + "]", "A" ); - ProgramExpression programExpressionB = new ProgramExpression( "[" - + ProgramExpression.OBJECT_PROGRAM_STAGE_DATAELEMENT + ProgramExpression.SEPARATOR_OBJECT + stageA.getUid() - + "." + dataElementB.getUid() + "]", "B" ); - - ProgramExpression programExpressionC = new ProgramExpression( "[" - + ProgramExpression.OBJECT_PROGRAM_STAGE_DATAELEMENT + ProgramExpression.SEPARATOR_OBJECT + stageB.getUid() - + "." + dataElementA.getUid() + "]", "C" ); - ProgramExpression programExpressionD = new ProgramExpression( "[" - + ProgramExpression.OBJECT_PROGRAM_STAGE_DATAELEMENT + ProgramExpression.SEPARATOR_OBJECT + stageB.getUid() - + "." + dataElementB.getUid() + "]", "D" ); - - validationA = new ProgramValidation( "A", programExpressionA, programExpressionB, program ); - validationA.setOperator( Operator.valueOf( "equal_to" ) ); - - validationB = new ProgramValidation( "B", programExpressionC, programExpressionD, program ); - validationB.setOperator( Operator.valueOf( "greater_than" ) ); - } - - @Test - public void testAddProgramValidation() - { - int idA = programValidationService.addProgramValidation( validationA ); - int idB = programValidationService.addProgramValidation( validationB ); - - assertNotNull( programValidationService.getProgramValidation( idA ) ); - assertNotNull( programValidationService.getProgramValidation( idB ) ); - } - - @Test - public void testDeleteProgramValidation() - { - int idA = programValidationService.addProgramValidation( validationA ); - int idB = programValidationService.addProgramValidation( validationB ); - - assertNotNull( programValidationService.getProgramValidation( idA ) ); - assertNotNull( programValidationService.getProgramValidation( idB ) ); - - programValidationService.deleteProgramValidation( validationA ); - - assertNull( programValidationService.getProgramValidation( idA ) ); - assertNotNull( programValidationService.getProgramValidation( idB ) ); - - programValidationService.deleteProgramValidation( validationB ); - - assertNull( programValidationService.getProgramValidation( idA ) ); - assertNull( programValidationService.getProgramValidation( idB ) ); - } - - @Test - public void testUpdateProgramValidation() - { - int idA = programValidationService.addProgramValidation( validationA ); - - assertNotNull( programValidationService.getProgramValidation( idA ) ); - - validationA.setName( "B" ); - programValidationService.updateProgramValidation( validationA ); - - assertEquals( "B", programValidationService.getProgramValidation( idA ).getName() ); - } - - @Test - public void testGetEntityInstancevalidationById() - { - int idA = programValidationService.addProgramValidation( validationA ); - int idB = programValidationService.addProgramValidation( validationB ); - - assertEquals( validationA, programValidationService.getProgramValidation( idA ) ); - assertEquals( validationB, programValidationService.getProgramValidation( idB ) ); - } - - @Test - public void testGetAllProgramValidations() - { - programValidationService.addProgramValidation( validationA ); - programValidationService.addProgramValidation( validationB ); - - assertTrue( equals( programValidationService.getAllProgramValidation(), validationA, validationB ) ); - } - - @Test - public void testGetProgramValidationByStage() - { - programValidationService.addProgramValidation( validationA ); - programValidationService.addProgramValidation( validationB ); - - assertTrue( equals( programValidationService.getProgramValidation( stageA ), validationA ) ); - assertTrue( equals( programValidationService.getProgramValidation( stageB ), validationB ) ); - } - - @Test - public void testValidate() - { - programValidationService.addProgramValidation( validationA ); - programValidationService.addProgramValidation( validationB ); - - List validationList = new ArrayList<>(); - validationList.add( validationA ); - validationList.add( validationB ); - - List result = programValidationService.validate( validationList, stageInstanceA ); - assertEquals( 1, result.size() ); - assertEquals( result.iterator().next().getProgramValidation(), validationB ); - } -} diff --git a/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramValidationStoreTest.java b/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramValidationStoreTest.java deleted file mode 100644 index 8309f910..00000000 --- a/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramValidationStoreTest.java +++ /dev/null @@ -1,145 +0,0 @@ -package org.hisp.dhis.program; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import static org.junit.Assert.assertTrue; - -import java.util.HashSet; -import java.util.Set; - -import org.hisp.dhis.DhisSpringTest; -import org.hisp.dhis.dataelement.DataElement; -import org.hisp.dhis.dataelement.DataElementService; -import org.hisp.dhis.expression.Operator; -import org.hisp.dhis.organisationunit.OrganisationUnit; -import org.hisp.dhis.organisationunit.OrganisationUnitService; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; - -/** - * @author Chau Thu Tran - */ -public class ProgramValidationStoreTest - extends DhisSpringTest -{ - @Autowired - private ProgramValidationStore programValidationStore; - - @Autowired - private ProgramStageDataElementService programStageDataElementService; - - @Autowired - private OrganisationUnitService organisationUnitService; - - @Autowired - private DataElementService dataElementService; - - @Autowired - private ProgramService programService; - - @Autowired - private ProgramStageService programStageService; - - private Program program; - - private ProgramStage stageA; - - private ProgramStage stageB; - - private ProgramValidation validationA; - - private ProgramValidation validationB; - - @Override - public void setUpTest() - { - OrganisationUnit organisationUnit = createOrganisationUnit( 'A' ); - organisationUnitService.addOrganisationUnit( organisationUnit ); - - program = createProgram( 'A', new HashSet<>(), organisationUnit ); - programService.addProgram( program ); - - stageA = new ProgramStage( "A", program ); - int psIdA = programStageService.saveProgramStage( stageA ); - - stageB = new ProgramStage( "B", program ); - int psIdB = programStageService.saveProgramStage( stageB ); - - Set programStages = new HashSet<>(); - programStages.add( stageA ); - programStages.add( stageB ); - program.setProgramStages( programStages ); - programService.updateProgram( program ); - - DataElement dataElementA = createDataElement( 'A' ); - DataElement dataElementB = createDataElement( 'B' ); - - int deIdA = dataElementService.addDataElement( dataElementA ); - int deIdB = dataElementService.addDataElement( dataElementB ); - - ProgramStageDataElement stageDataElementA = new ProgramStageDataElement( stageA, dataElementA, false, 1 ); - ProgramStageDataElement stageDataElementB = new ProgramStageDataElement( stageA, dataElementB, false, 2 ); - ProgramStageDataElement stageDataElementC = new ProgramStageDataElement( stageB, dataElementA, false, 1 ); - ProgramStageDataElement stageDataElementD = new ProgramStageDataElement( stageB, dataElementB, false, 2 ); - - programStageDataElementService.addProgramStageDataElement( stageDataElementA ); - programStageDataElementService.addProgramStageDataElement( stageDataElementB ); - programStageDataElementService.addProgramStageDataElement( stageDataElementC ); - programStageDataElementService.addProgramStageDataElement( stageDataElementD ); - - ProgramExpression programExpressionA = new ProgramExpression( "[" - + ProgramExpression.OBJECT_PROGRAM_STAGE_DATAELEMENT + ProgramExpression.SEPARATOR_OBJECT + psIdA + "." - + deIdA + "]", "A" ); - ProgramExpression programExpressionB = new ProgramExpression( "[" - + ProgramExpression.OBJECT_PROGRAM_STAGE_DATAELEMENT + ProgramExpression.SEPARATOR_OBJECT + psIdA + "." - + deIdB + "]", "B" ); - - ProgramExpression programExpressionC = new ProgramExpression( "[" - + ProgramExpression.OBJECT_PROGRAM_STAGE_DATAELEMENT + ProgramExpression.SEPARATOR_OBJECT + psIdB + "." - + deIdA + "]", "C" ); - ProgramExpression programExpressionD = new ProgramExpression( "[" - + ProgramExpression.OBJECT_PROGRAM_STAGE_DATAELEMENT + ProgramExpression.SEPARATOR_OBJECT + psIdB + "." - + deIdB + "]", "D" ); - - validationA = new ProgramValidation( "A", programExpressionA, programExpressionB, program ); - validationA.setOperator( Operator.valueOf( "equal_to" ) ); - - validationB = new ProgramValidation( "B", programExpressionC, programExpressionD, program ); - validationB.setOperator( Operator.valueOf( "greater_than" ) ); - } - - @Test - public void testGetProgramValidationByProgram() - { - programValidationStore.save( validationA ); - programValidationStore.save( validationB ); - - assertTrue( equals( programValidationStore.get( program ), validationA, validationB ) ); - } -} diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Metadata.java b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Metadata.java index db9c683a..bf33d124 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Metadata.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Metadata.java @@ -85,7 +85,6 @@ import org.hisp.dhis.program.ProgramStageDataElement; import org.hisp.dhis.program.ProgramStageSection; import org.hisp.dhis.program.ProgramTrackedEntityAttribute; -import org.hisp.dhis.program.ProgramValidation; import org.hisp.dhis.programrule.ProgramRule; import org.hisp.dhis.programrule.ProgramRuleAction; import org.hisp.dhis.programrule.ProgramRuleVariable; @@ -230,8 +229,6 @@ public class Metadata private List programIndicators = new ArrayList<>(); - private List programValidations = new ArrayList<>(); - private List programStageSections = new ArrayList<>(); private List programTrackedEntityAttributes = new ArrayList<>(); @@ -961,19 +958,6 @@ public void setProgramIndicators( List programIndicators ) this.programIndicators = programIndicators; } - @JsonProperty - @JacksonXmlElementWrapper( localName = "programValidations", namespace = DxfNamespaces.DXF_2_0 ) - @JacksonXmlProperty( localName = "programValidation", namespace = DxfNamespaces.DXF_2_0 ) - public List getProgramValidations() - { - return programValidations; - } - - public void setProgramValidations( List programValidations ) - { - this.programValidations = programValidations; - } - @JsonProperty @JacksonXmlElementWrapper( localName = "programStageSections", namespace = DxfNamespaces.DXF_2_0 ) @JacksonXmlProperty( localName = "programStageSection", namespace = DxfNamespaces.DXF_2_0 ) diff --git a/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java b/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java index 9182e453..d054b417 100644 --- a/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java +++ b/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java @@ -1,7 +1,7 @@ package org.hisp.dhis.system.deletion; /* - * Copyright (c) 2004-2016, University of Oslo + * Copyright (c) 2004-2017, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -88,7 +88,6 @@ import org.hisp.dhis.program.ProgramStageDataElement; import org.hisp.dhis.program.ProgramStageInstance; import org.hisp.dhis.program.ProgramStageSection; -import org.hisp.dhis.program.ProgramValidation; import org.hisp.dhis.program.message.ProgramMessage; import org.hisp.dhis.program.notification.ProgramNotificationTemplate; import org.hisp.dhis.programrule.ProgramRule; @@ -717,15 +716,6 @@ public void deleteTrackedEntityDataValue( TrackedEntityDataValue dataValue ) { } - public String allowDeleteProgramValidation( ProgramValidation programValidation ) - { - return null; - } - - public void deleteProgramValidation( ProgramValidation programValidation ) - { - } - public void deleteProgramIndicator( ProgramIndicator programIndicator ) { } diff --git a/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramValidationController.java b/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramValidationController.java deleted file mode 100644 index b33acedc..00000000 --- a/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramValidationController.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.hisp.dhis.webapi.controller.event; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import org.hisp.dhis.program.ProgramValidation; -import org.hisp.dhis.schema.descriptors.ProgramValidationSchemaDescriptor; -import org.hisp.dhis.webapi.controller.AbstractCrudController; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * @author Morten Olav Hansen - */ -@Controller -@RequestMapping( value = ProgramValidationSchemaDescriptor.API_ENDPOINT ) -public class ProgramValidationController - extends AbstractCrudController -{ -} diff --git a/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js b/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js index 5eebb0cf..e0820c0d 100644 --- a/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js +++ b/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js @@ -547,21 +547,6 @@ var validationRules = { "required" : true } }, - "programValidation" : { - "name" : { - "required" : true, - "rangelength" : [2,230] - }, - "operator" : { - "required" : true - }, - "description" : { - "required" : true - }, - "expression" : { - "required" : true - } - }, "validationCriteria" : { "name" : { "required" : true, diff --git a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/AddProgramValidationAction.java b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/AddProgramValidationAction.java deleted file mode 100644 index 8c397f82..00000000 --- a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/AddProgramValidationAction.java +++ /dev/null @@ -1,149 +0,0 @@ -package org.hisp.dhis.trackedentity.action.validation; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import org.apache.commons.lang3.StringUtils; -import org.hisp.dhis.expression.Operator; -import org.hisp.dhis.program.Program; -import org.hisp.dhis.program.ProgramExpression; -import org.hisp.dhis.program.ProgramService; -import org.hisp.dhis.program.ProgramValidation; -import org.hisp.dhis.program.ProgramValidationService; - -import com.opensymphony.xwork2.Action; - -/** - * @author Chau Thu Tran - * @version $ AddProgramValidationAction.java Apr 28, 2011 11:15:06 AM $ - */ -public class AddProgramValidationAction - implements Action -{ - // ------------------------------------------------------------------------- - // Dependencies - // ------------------------------------------------------------------------- - - private ProgramValidationService programValidationService; - - public void setProgramValidationService( ProgramValidationService programValidationService ) - { - this.programValidationService = programValidationService; - } - - private ProgramService programService; - - public void setProgramService( ProgramService programService ) - { - this.programService = programService; - } - - // ------------------------------------------------------------------------- - // Input/Output - // ------------------------------------------------------------------------- - - private String name; - - public void setName( String name ) - { - this.name = name; - } - - private String operator; - - public void setOperator( String operator ) - { - this.operator = operator; - } - - private String leftSideExpression; - - public void setLeftSideExpression( String leftSideExpression ) - { - this.leftSideExpression = leftSideExpression; - } - - private String leftSideDescription; - - public void setLeftSideDescription( String leftSideDescription ) - { - this.leftSideDescription = leftSideDescription; - } - - private String rightSideExpression; - - public void setRightSideExpression( String rightSideExpression ) - { - this.rightSideExpression = rightSideExpression; - } - - private String rightSideDescription; - - public void setRightSideDescription( String rightSideDescription ) - { - this.rightSideDescription = rightSideDescription; - } - - private Integer programId; - - public void setProgramId( Integer programId ) - { - this.programId = programId; - } - - public Integer getProgramId() - { - return programId; - } - - // ------------------------------------------------------------------------- - // Implementation Action - // ------------------------------------------------------------------------- - - @Override - public String execute() - throws Exception - { - ProgramExpression leftExpression = new ProgramExpression( leftSideExpression, StringUtils.trimToNull( leftSideDescription ) ); - ProgramExpression rightExpression = new ProgramExpression( rightSideExpression, StringUtils.trimToNull( rightSideDescription ) ); - - ProgramValidation validation = new ProgramValidation(); - validation.setName( StringUtils.trimToNull( name ) ); - validation.setOperator( Operator.valueOf( operator ) ); - validation.setLeftSide( leftExpression ); - validation.setRightSide( rightExpression ); - - Program program = programService.getProgram( programId ); - validation.setProgram( program ); - - programValidationService.addProgramValidation( validation ); - - return SUCCESS; - } - -} diff --git a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/GetProgramValidationAction.java b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/GetProgramValidationAction.java deleted file mode 100644 index db9becfb..00000000 --- a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/GetProgramValidationAction.java +++ /dev/null @@ -1,120 +0,0 @@ -package org.hisp.dhis.trackedentity.action.validation; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import org.hisp.dhis.program.Program; -import org.hisp.dhis.program.ProgramExpressionService; -import org.hisp.dhis.program.ProgramValidation; -import org.hisp.dhis.program.ProgramValidationService; - -import com.opensymphony.xwork2.Action; - -/** - * @author Chau Thu Tran - * @version $ GetProgramValidationAction.java Apr 28, 2011 11:17:58 AM $ - */ -public class GetProgramValidationAction - implements Action -{ - // ------------------------------------------------------------------------- - // Dependencies - // ------------------------------------------------------------------------- - - private ProgramValidationService programValidationService; - - public void setProgramValidationService( ProgramValidationService programValidationService ) - { - this.programValidationService = programValidationService; - } - - private ProgramExpressionService programExpressionService; - - public void setProgramExpressionService( ProgramExpressionService programExpressionService ) - { - this.programExpressionService = programExpressionService; - } - - // ------------------------------------------------------------------------- - // Input && Output - // ------------------------------------------------------------------------- - - private Integer validationId; - - public void setValidationId( Integer validationId ) - { - this.validationId = validationId; - } - - private ProgramValidation validation; - - public ProgramValidation getValidation() - { - return validation; - } - - private String leftSideTextualExpression; - - public String getLeftSideTextualExpression() - { - return leftSideTextualExpression; - } - - private String rightSideTextualExpression; - - public String getRightSideTextualExpression() - { - return rightSideTextualExpression; - } - - private Program program; - - public Program getProgram() - { - return program; - } - - // ------------------------------------------------------------------------- - // Implementation Action - // ------------------------------------------------------------------------- - - @Override - public String execute() - throws Exception - { - validation = programValidationService.getProgramValidation( validationId ); - - leftSideTextualExpression = programExpressionService.getExpressionDescription( validation.getLeftSide().getExpression() ); - - rightSideTextualExpression = programExpressionService.getExpressionDescription( validation.getRightSide().getExpression() ); - - program = validation.getProgram(); - - return SUCCESS; - } -} diff --git a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/GetProgramValidationListAction.java b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/GetProgramValidationListAction.java deleted file mode 100644 index b0896d14..00000000 --- a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/GetProgramValidationListAction.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.hisp.dhis.trackedentity.action.validation; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import java.util.Collection; - -import org.hisp.dhis.program.Program; -import org.hisp.dhis.program.ProgramService; -import org.hisp.dhis.program.ProgramValidation; -import org.hisp.dhis.program.ProgramValidationService; - -import com.opensymphony.xwork2.Action; - -/** - * @author Chau Thu Tran - * @version $ GetProgramValidationListAction.java Apr 28, 2011 11:19:56 AM $ - */ -public class GetProgramValidationListAction - implements Action -{ - // ------------------------------------------------------------------------- - // Dependencies - // ------------------------------------------------------------------------- - - private ProgramValidationService programValidationService; - - public void setProgramValidationService( ProgramValidationService programValidationService ) - { - this.programValidationService = programValidationService; - } - - private ProgramService programService; - - public void setProgramService( ProgramService programService ) - { - this.programService = programService; - } - - // ------------------------------------------------------------------------- - // Input && Output - // ------------------------------------------------------------------------- - - private Integer programId; - - private Collection validations; - - private Program program; - - // ------------------------------------------------------------------------- - // Getter && Setter - // ------------------------------------------------------------------------- - - public Collection getValidations() - { - return validations; - } - - public Program getProgram() - { - return program; - } - - public void setProgramId( Integer programId ) - { - this.programId = programId; - } - - // ------------------------------------------------------------------------- - // Implementation Action - // ------------------------------------------------------------------------- - - @Override - public String execute() - throws Exception - { - program = programService.getProgram( programId ); - - validations = programValidationService.getProgramValidation( program ); - - return SUCCESS; - } - -} diff --git a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/RemoveProgramValidationAction.java b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/RemoveProgramValidationAction.java deleted file mode 100644 index af1e8c72..00000000 --- a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/RemoveProgramValidationAction.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.hisp.dhis.trackedentity.action.validation; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import org.hisp.dhis.program.ProgramValidation; -import org.hisp.dhis.program.ProgramValidationService; - -import com.opensymphony.xwork2.Action; - -/** - * @author Chau Thu Tran - * @version $ RemoveProgramValidationAction.java Apr 28, 2011 11:22:14 AM $ - */ -public class RemoveProgramValidationAction - implements Action -{ - // ------------------------------------------------------------------------- - // Dependencies - // ------------------------------------------------------------------------- - - private ProgramValidationService programValidationService; - - // ------------------------------------------------------------------------- - // Input - // ------------------------------------------------------------------------- - - private Integer id; - - // ------------------------------------------------------------------------- - // Setters - // ------------------------------------------------------------------------- - - public void setProgramValidationService( ProgramValidationService programValidationService ) - { - this.programValidationService = programValidationService; - } - - public void setId( Integer id ) - { - this.id = id; - } - - // ------------------------------------------------------------------------- - // Implementation Action - // ------------------------------------------------------------------------- - - @Override - public String execute() - throws Exception - { - ProgramValidation validation = programValidationService.getProgramValidation( id ); - - programValidationService.deleteProgramValidation( validation ); - - return SUCCESS; - } - -} diff --git a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/UpdateProgramValidationAction.java b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/UpdateProgramValidationAction.java deleted file mode 100644 index a3b642de..00000000 --- a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/UpdateProgramValidationAction.java +++ /dev/null @@ -1,145 +0,0 @@ -package org.hisp.dhis.trackedentity.action.validation; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import org.apache.commons.lang3.StringUtils; -import org.hisp.dhis.expression.Operator; -import org.hisp.dhis.program.ProgramExpression; -import org.hisp.dhis.program.ProgramValidation; -import org.hisp.dhis.program.ProgramValidationService; - -import com.opensymphony.xwork2.Action; - -/** - * @author Chau Thu Tran - * @version $ UpdateProgramValidationAction.java Apr 28, 2011 11:24:43 AM $ - */ -public class UpdateProgramValidationAction - implements Action -{ - // ------------------------------------------------------------------------- - // Dependencies - // ------------------------------------------------------------------------- - - private ProgramValidationService programValidationService; - - public void setProgramValidationService( ProgramValidationService programValidationService ) - { - this.programValidationService = programValidationService; - } - - // ------------------------------------------------------------------------- - // Input - // ------------------------------------------------------------------------- - - private Integer id; - - public void setId( Integer id ) - { - this.id = id; - } - - private String name; - - public void setName( String name ) - { - this.name = name; - } - - private String operator; - - public void setOperator( String operator ) - { - this.operator = operator; - } - - private String leftSideExpression; - - public void setLeftSideExpression( String leftSideExpression ) - { - this.leftSideExpression = leftSideExpression; - } - - private String leftSideDescription; - - public void setLeftSideDescription( String leftSideDescription ) - { - this.leftSideDescription = leftSideDescription; - } - - private String rightSideExpression; - - public void setRightSideExpression( String rightSideExpression ) - { - this.rightSideExpression = rightSideExpression; - } - - private String rightSideDescription; - - public void setRightSideDescription( String rightSideDescription ) - { - this.rightSideDescription = rightSideDescription; - } - - private Integer programId; - - public void setProgramId( Integer programId ) - { - this.programId = programId; - } - - public Integer getProgramId() - { - return programId; - } - - // ------------------------------------------------------------------------- - // Implementation Action - // ------------------------------------------------------------------------- - - @Override - public String execute() - throws Exception - { - ProgramValidation validation = programValidationService.getProgramValidation( id ); - - ProgramExpression leftExpression = new ProgramExpression( leftSideExpression, StringUtils.trimToNull( leftSideDescription ) ); - ProgramExpression rightExpression = new ProgramExpression( rightSideExpression, StringUtils.trimToNull( rightSideDescription ) ); - - validation.setName( StringUtils.trimToNull( name ) ); - validation.setOperator( Operator.valueOf( operator ) ); - validation.setLeftSide( leftExpression ); - validation.setRightSide( rightExpression ); - - programValidationService.updateProgramValidation( validation ); - - return SUCCESS; - } - -} diff --git a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml index b365d3c0..b1737096 100644 --- a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml +++ b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml @@ -436,60 +436,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /main.vm - /dhis-web-maintenance-program/programValidationList.vm - javascript/programValidation.js - F_PROGRAM_VALIDATION - - - - /main.vm - /dhis-web-maintenance-program/addSingleProgramValidationForm.vm - javascript/programValidation.js - style/basic.css - F_PROGRAM_VALIDATION - - - - - programValidation.action?programId=${programId} - - F_PROGRAM_VALIDATION - - - - /main.vm - /dhis-web-maintenance-program/updateMultiProgramValidationForm.vm - javascript/programValidation.js - style/basic.css - F_PROGRAM_VALIDATION - - - - /main.vm - /dhis-web-maintenance-program/updateSingleProgramValidationForm.vm - javascript/programValidation.js - style/basic.css - F_PROGRAM_VALIDATION - - - - - programValidation.action?programId=${programId} - - F_PROGRAM_VALIDATION - - - - - /dhis-web-commons/ajax/jsonResponseSuccess.vm - - F_PROGRAM_VALIDATION - - - - - /dhis-web-commons/ajax/jsonProgramValidation.vm - - plainTextError - diff --git a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addSingleProgramValidationForm.vm b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addSingleProgramValidationForm.vm deleted file mode 100644 index 8ae2ea2f..00000000 --- a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addSingleProgramValidationForm.vm +++ /dev/null @@ -1,73 +0,0 @@ -

    $i18n.getString( "create_new_program_validation_rule" )

    - -

    $program.displayName

    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    $i18n.getString( "program_validation_rule_details" )
    - -
    - -
    - - - - - - -
    - - -
    - -#parse( "/dhis-web-maintenance-program/expressionBuilderForm.vm" ) - - diff --git a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js index dacef930..7953b543 100644 --- a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js +++ b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js @@ -26,10 +26,6 @@ function programStageManagement( context ) { location.href = 'programStage.action?id=' + context.id; } -function programValidationManagement( context ) { - location.href = 'programValidation.action?programId=' + context.id; -} - function defineProgramAssociationsForm( context ) { location.href = 'defineProgramAssociationsForm.action?id=' + context.id; } diff --git a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programValidation.js b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programValidation.js deleted file mode 100644 index aa01b5e5..00000000 --- a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programValidation.js +++ /dev/null @@ -1,211 +0,0 @@ -var COLOR_GREEN = '#b9ffb9'; -var COLOR_WHITE = '#ffffff' - -jQuery(document).ready(function() { - - validation2( 'programValidationForm', function( form ) - { - form.submit(); - },{ - 'rules' : getValidationRules( "programValidation" ) - }); - - dhis2.contextmenu.makeContextMenu({ - menuId: 'contextMenu', - menuItemActiveClass: 'contextMenuItemActive' - }); -}); - -// ----------------------------------------------------------------------------- -// View details -// ----------------------------------------------------------------------------- - -function showUpdateSingleProgramValidationForm( context ) { - location.href = 'showUpdateSingleProgramValidationForm.action?validationId=' + context.id; -} - -function showProgramValidationDetails( context ) { - jQuery.getJSON('getProgramValidation.action', { validationId: context.id }, function( json ) { - setInnerHTML('descriptionField', json.validation.description); - setInnerHTML('idField', json.validation.uid); - - var operator = json.validation.operator; - setInnerHTML('operatorField', i18nalizeOperator(operator)); - - setInnerHTML('leftSideDescriptionField', json.validation.leftSideDescription); - setInnerHTML('leftSideExpressionField', json.validation.leftSideExpression); - setInnerHTML('rightSideDescriptionField', json.validation.rightSideDescription); - setInnerHTML('rightSideExpressionField', json.validation.rightSideExpression); - - showDetails(); - }); -} - -function i18nalizeOperator( operator ) { - if( operator == "equal_to" ) { - return i18n_equal_to; - } - else if( operator == "not_equal_to" ) { - return i18n_not_equal_to; - } - else if( operator == "greater_than" ) { - return i18n_greater_than; - } - else if( operator == "greater_than_or_equal_to" ) { - return i18n_greater_than_or_equal_to; - } - else if( operator == "less_than" ) { - return i18n_less_than; - } - else if( operator == "less_than_or_equal_to" ) { - return i18n_less_than_or_equal_to; - } - - return null; -} - -// ----------------------------------------------------------------------------- -// Remove ProgramValidation -// ----------------------------------------------------------------------------- - -function removeProgramValidation( context ) { - removeItem(context.id, context.name, i18n_confirm_delete, 'removeProgramValidation.action'); -} - -//------------------------------------------------------------------------------ -// Load data-elements of each program-stage -//------------------------------------------------------------------------------ - -function getLeftPrgramStageDataElements() { - clearListById('dataElementId'); - - var programStage = document.getElementById('leftStage'); - var programStageId = programStage.options[ programStage.selectedIndex ].id; - var programStageUid = programStage.options[ programStage.selectedIndex ].value; - if( programStageId == '' ) return; - - jQuery.getJSON("getTrackedEntityDataElements.action", { - programStageId: programStageId - }, function( json ) { - jQuery('#dataElementId').append(''); - jQuery('#dataElementId').append(''); - for( i in json.dataElements ) { - var id = '[DE:' + programStageUid + '.' + json.dataElements[i].id + ']'; - jQuery('#dataElementId').append(''); - } - }); -} - -//------------------------------------------------------------------------------ -// Show Left side form for designing -//------------------------------------------------------------------------------ - -function editLeftExpression() { - left = true; - - $('#expression').val($('#leftSideExpression').val()); - $('#expression-container [id=description]').val($('#leftSideDescription').val()); - $('#formulaText').text($('#leftSideTextualExpression').val()); - $('#nullIfBlank').attr('checked', ( $('#leftSideNullIfBlank').val() == 'true' || $('#leftSideNullIfBlank').val() == '' )); - setInnerHTML("exp-descriptionInfo", ""); - setInnerHTML("exp-expressionInfo", ""); - $("#expression-container [id=description]").css("background-color", "#ffffff"); - $("#expression-container [id=expression]").css("background-color", "#ffffff"); - - dialog.dialog("open"); -} - -function editRightExpression() { - left = false; - - $('#expression').val($('#rightSideExpression').val()); - $('#expression-container [id=description]').val($('#rightSideDescription').val()); - $('#formulaText').text($('#rightSideTextualExpression').val()); - $('#nullIfBlank').attr('checked', ( $('#rightSideNullIfBlank').val() == 'true' || $('#rightSideNullIfBlank').val() == '' )); - - dialog.dialog("open"); -} - -//------------------------------------------------------------------------------ -// Insert formulas -//------------------------------------------------------------------------------ - -function insertText( inputAreaName, inputText ) { - insertTextCommon(inputAreaName, inputText); - getExpressionText(); -} - - -function getExpressionText() { - $.ajax({ - url: "getProgramExpressionDescription.action", - type: "POST", - data:{ programExpression: $('#expression').val() }, - dataType: "json", - success: function( json ){ - setInnerHTML("formulaText", json.message); - if( json.response == "error" ){ - $("#formulaText").css("color","red"); - $("#formulaText").addClass("validateError"); - } - else{ - $("#formulaText").css("color","black"); - $("#formulaText").removeClass("error"); - } - } - }); - - -} - -var left = true; -function insertExpression() { - var expression = $('#expression').val(); - var description = $('#expression-container [id=description]').val(); - - if( left ) { - $('#leftSideExpression').val(expression); - $('#leftSideDescription').val(description); - $('#leftSideTextualExpression').val($('#formulaText').text()); - $('#leftSideNullIfBlank').val($('#nullIfBlank').is(':checked')); - } - else { - $('#rightSideExpression').val(expression); - $('#rightSideDescription').val(description); - $('#rightSideTextualExpression').val($('#formulaText').text()); - $('#rightSideNullIfBlank').val($('#nullIfBlank').is(':checked')); - } - - dialog.dialog("close"); -} - -function validateExpression() { - getExpressionText(); - if( checkValidationRule(jQuery("#expression-container [id=description]"), i18n_description_not_null) == false ) - return; - if( checkValidationRule(jQuery("#expression-container [id=expression]"), i18n_expression_not_null) == false ) - return; - insertExpression(); -} - -function checkValidationRule( field, message ) { - if( field.val().length == 0 ) { - setInnerHTML("exp-" + field.attr("name") + "Info", message); - $('#expression-container [id=' + field.attr("name") + "]").css("background-color", "#ffc5c5"); - return false; - } - else if( $("#formulaText").attr("class") == "validateError" ){ - return false; - } - else { - setInnerHTML("exp-" + field.attr("name") + "Info", ''); - $('#expression-container [id=' + field.attr("name") + "]").css("background-color", "#ffffff"); - } - - return true; -} - -function clearSearchText() { - setFieldValue('filter', ''); - filterList('', 'dataElementId') -} \ No newline at end of file diff --git a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm index b406cc6a..e44a4ce0 100644 --- a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm +++ b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm @@ -12,7 +12,6 @@
  •   $i18n.getString( "view_program_indicators" )
  •   $i18n.getString( "view_program_rule" )
    • -
  •   $i18n.getString( "view_validation_rules" )
  •   $i18n.getString( "view_program_notifications" )
  •   $i18n.getString( "translation_translate" )
  •   $i18n.getString( "remove" )
    • diff --git a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programValidationList.vm b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programValidationList.vm deleted file mode 100644 index 9e28a15c..00000000 --- a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programValidationList.vm +++ /dev/null @@ -1,91 +0,0 @@ -

    $i18n.getString( "program_validation_rule_management" ) #openHelp( "program_validation_rule" )

    - -

    $encoder.htmlEncode($program.displayName)

    - - - - - -
    - - - - - - - -
    - - - - - -
    - - - - -
    - -
    - - - - - - - - - - #foreach( $validation in $validations ) - - - - #end - -
    $i18n.getString( "name" )
    $encoder.htmlEncode( $!validation.displayName )
    -     		-
    -
    - $i18n.getString( 'hide_details' ) -
    -


    -


    -


    -


    -


    -


    -


    -
    -
    - - diff --git a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm deleted file mode 100644 index f9b5f505..00000000 --- a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm +++ /dev/null @@ -1,77 +0,0 @@ -

    $i18n.getString( "update_program_validation_rule" )

    - -

    $encoder.htmlEncode($validation.program.displayName)

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    $i18n.getString( "program_validation_rule_details" )
    - -
    - -
    - - - - - - - - - - - -
    - - -
    - -#parse( "/dhis-web-maintenance-program/expressionBuilderForm.vm" ) - - - - From f5ac3abf98bac34bbce6e78e6f4d02b8e7f4139f Mon Sep 17 00:00:00 2001 From: talexie Date: Thu, 6 Apr 2017 17:22:53 +0300 Subject: [PATCH 13/31] Fix analytics typo (#688) --- .../dhis/analytics/table/JdbcEventAnalyticsTableManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java index fd761961..be91c013 100644 --- a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java +++ b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java @@ -364,7 +364,7 @@ private List getDataYears( Program program, Date earliest ) "from programstageinstance psi " + "inner join programinstance pi on psi.programinstanceid = pi.programinstanceid " + "where pi.programid = " + program.getId() + " " + - "and psi.executiondate is not null"; + "and psi.executiondate is not null "; if ( earliest != null ) { From b6a656832fdc977621ddf53dac2b5772c926be1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= Date: Mon, 10 Apr 2017 10:00:31 +0200 Subject: [PATCH 14/31] Deletion handler, added missing methods for PTEA --- .../org/hisp/dhis/system/deletion/DeletionHandler.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java b/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java index d054b417..20c8b89e 100644 --- a/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java +++ b/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java @@ -88,6 +88,7 @@ import org.hisp.dhis.program.ProgramStageDataElement; import org.hisp.dhis.program.ProgramStageInstance; import org.hisp.dhis.program.ProgramStageSection; +import org.hisp.dhis.program.ProgramTrackedEntityAttribute; import org.hisp.dhis.program.message.ProgramMessage; import org.hisp.dhis.program.notification.ProgramNotificationTemplate; import org.hisp.dhis.programrule.ProgramRule; @@ -905,6 +906,15 @@ public void deleteProgramDataElement( ProgramDataElement programDataElement ) { } + public void deleteProgramTrackedEntityAttribute( ProgramTrackedEntityAttribute attribute ) + { + } + + public String allowDeleteProgramTrackedEntityAttribute( ProgramTrackedEntityAttribute attribute ) + { + return null; + } + public String allowDeleteColorSet( ColorSet colorSet ) { return null; From a8a5b9dec71743e10be6c3682b31244976138885 Mon Sep 17 00:00:00 2001 From: Jhansi Karee Date: Wed, 12 Apr 2017 18:13:35 +0530 Subject: [PATCH 15/31] Implemented LastUpdated on dataStore/{namespace} API on 2.25 (#702) * Jhansi | #2398 | Upgraded Struts Library to 2.3.32 * Jhansi | Implemented LastUpdated on dataStore/{namespace} API * Madhoolika,Jhansi | Formatted the code to follow dhis2 code style --- .../keyjsonvalue/KeyJsonValueService.java | 9 ++++++++ .../dhis/keyjsonvalue/KeyJsonValueStore.java | 9 ++++++++ .../DefaultKeyJsonValueService.java | 7 ++++++ .../hibernate/HibernateKeyJsonValueStore.java | 23 ++++++++++++++++++- .../controller/KeyJsonValueController.java | 5 ++-- 5 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/keyjsonvalue/KeyJsonValueService.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/keyjsonvalue/KeyJsonValueService.java index f862624f..6575779e 100644 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/keyjsonvalue/KeyJsonValueService.java +++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/keyjsonvalue/KeyJsonValueService.java @@ -29,6 +29,7 @@ */ import java.util.List; +import java.util.Date; /** * @author Stian Sandvold @@ -48,6 +49,14 @@ public interface KeyJsonValueService */ List getKeysInNamespace( String namespace ); + /** + * Retrieves a list of keys from a namespace which are updated after lastUpdated time + * @param namespace the namespace to retrieve keys from + * @param lastUpdated the lastUpdated time to retrieve keys from + * @return a list of strings representing the keys from the namespace + */ + List getKeysInNamespace( String namespace, Date lastUpdated ); + /** * Deletes all keys associated with a given namespace * @param namespace the namespace to delete diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/keyjsonvalue/KeyJsonValueStore.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/keyjsonvalue/KeyJsonValueStore.java index f986752a..8adc0a0f 100644 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/keyjsonvalue/KeyJsonValueStore.java +++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/keyjsonvalue/KeyJsonValueStore.java @@ -31,6 +31,7 @@ import org.hisp.dhis.common.GenericIdentifiableObjectStore; import java.util.List; +import java.util.Date; /** * @author Stian Sandvold @@ -51,6 +52,14 @@ public interface KeyJsonValueStore */ List getKeysInNamespace( String namespace ); + /** + * Retrieves a list of keys associated with a given namespace which are updated after lastUpdated time. + * @param namespace the namespace to retrieve keys from + * @param lastUpdated the lastUpdated time to retrieve keys from + * @return a list of strings representing the different keys in the namespace + */ + List getKeysInNamespace( String namespace, Date lastUpdated ); + /** * Retrieves a list of KeyJsonValue objects based on a given namespace * @param namespace the namespace to retrieve KeyJsonValues from diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/keyjsonvalue/DefaultKeyJsonValueService.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/keyjsonvalue/DefaultKeyJsonValueService.java index 4744db71..1eb31c7a 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/keyjsonvalue/DefaultKeyJsonValueService.java +++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/keyjsonvalue/DefaultKeyJsonValueService.java @@ -31,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Date; /** * @author Stian Sandvold @@ -62,6 +63,12 @@ public List getKeysInNamespace( String namespace ) return keyJsonValueStore.getKeysInNamespace( namespace ); } + @Override + public List getKeysInNamespace( String namespace, Date lastUpdated ) + { + return keyJsonValueStore.getKeysInNamespace( namespace, lastUpdated ); + } + @Override public void deleteNamespace( String namespace ) { diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/keyjsonvalue/hibernate/HibernateKeyJsonValueStore.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/keyjsonvalue/hibernate/HibernateKeyJsonValueStore.java index c7cbd5b5..32e291c8 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/keyjsonvalue/hibernate/HibernateKeyJsonValueStore.java +++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/keyjsonvalue/hibernate/HibernateKeyJsonValueStore.java @@ -31,9 +31,12 @@ import java.util.List; import org.hibernate.criterion.Restrictions; +import org.hibernate.Query; import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore; import org.hisp.dhis.keyjsonvalue.KeyJsonValue; import org.hisp.dhis.keyjsonvalue.KeyJsonValueStore; +import org.hisp.dhis.system.util.DateUtils; +import java.util.Date; /** * @author Stian Sandvold @@ -56,10 +59,28 @@ public List getNamespaces() public List getKeysInNamespace( String namespace ) { String hql = "select key from KeyJsonValue where namespace = :namespace"; - + return getQuery( hql ).setString( "namespace", namespace ).list(); } + @Override + @SuppressWarnings( "unchecked" ) + public List getKeysInNamespace( String namespace, Date lastUpdated ) + { + String hql = "select key from KeyJsonValue where namespace = :namespace"; + if ( lastUpdated != null ) + { + hql += " and lastupdated >= :lastUpdated "; + } + Query query = getQuery( hql ).setString( "namespace", namespace ); + if ( lastUpdated != null ) + { + query.setTimestamp( "lastUpdated", lastUpdated ); + } + + return query.list(); + } + @Override @SuppressWarnings( "unchecked" ) public List getKeyJsonValueByNamespace( String namespace ) diff --git a/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/KeyJsonValueController.java b/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/KeyJsonValueController.java index 1c83a4b1..908bca26 100644 --- a/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/KeyJsonValueController.java +++ b/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/KeyJsonValueController.java @@ -51,6 +51,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; +import java.util.Date; /** * @author Stian Sandvold @@ -87,7 +88,7 @@ public class KeyJsonValueController * Returns a list of strings representing keys in the given namespace. */ @RequestMapping( value = "/{namespace}", method = RequestMethod.GET, produces = "application/json" ) - public @ResponseBody List getKeysInNamespace( @PathVariable String namespace, HttpServletResponse response ) + public @ResponseBody List getKeysInNamespace( @RequestParam( required = false ) Date lastUpdated, @PathVariable String namespace, HttpServletResponse response ) throws IOException, WebMessageException { if ( !keyJsonValueService.getNamespaces().contains( namespace ) ) @@ -96,7 +97,7 @@ public class KeyJsonValueController WebMessageUtils.notFound( "The namespace '" + namespace + "' was not found." ) ); } - return keyJsonValueService.getKeysInNamespace( namespace ); + return keyJsonValueService.getKeysInNamespace( namespace, lastUpdated ); } /** From b60c027db38cd322e2800514e87c63115c5d889b Mon Sep 17 00:00:00 2001 From: Jim Grace Date: Wed, 12 Apr 2017 14:09:01 -0400 Subject: [PATCH 16/31] Speed up ADX import --- .../hisp/dhis/scheduling/TaskCategory.java | 1 + .../java/org/hisp/dhis/scheduling/TaskId.java | 9 +- .../hisp/dhis/dxf2/adx/AdxDataService.java | 4 +- .../dhis/dxf2/adx/DefaultAdxDataService.java | 215 ++++++++++-------- .../system/notification/InMemoryNotifier.java | 38 +++- .../dhis/system/notification/Notifier.java | 8 +- .../controller/DataValueSetController.java | 22 +- .../web/ohie/adx/webapi/AdxController.java | 6 +- 8 files changed, 190 insertions(+), 113 deletions(-) diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/TaskCategory.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/TaskCategory.java index e1ac8e2e..db6ad21f 100644 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/TaskCategory.java +++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/TaskCategory.java @@ -37,6 +37,7 @@ public enum TaskCategory ANALYTICSTABLE_UPDATE, MONITORING, DATAVALUE_IMPORT, + DATAVALUE_IMPORT_INTERNAL, EVENT_IMPORT, METADATA_IMPORT, AGGREGATE_QUERY_BUILDER, diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/TaskId.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/TaskId.java index 37191108..8d9e6f09 100644 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/TaskId.java +++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/TaskId.java @@ -62,12 +62,17 @@ public String getId() return id; } - + public TaskCategory getCategory() { return category; } - + + public User getUser() + { + return user; + } + @Override public int hashCode() { diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/AdxDataService.java b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/AdxDataService.java index d7b87e28..963d7c8b 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/AdxDataService.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/AdxDataService.java @@ -36,7 +36,7 @@ import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.dxf2.datavalueset.DataExportParams; -import org.hisp.dhis.dxf2.importsummary.ImportSummaries; +import org.hisp.dhis.dxf2.importsummary.ImportSummary; import org.hisp.dhis.scheduling.TaskId; /** @@ -85,7 +85,7 @@ DataExportParams getFromUrl( Set dataSets, Set periods, Date sta * * @return an ImportSummaries collection of ImportSummary for each DataValueSet. */ - ImportSummaries saveDataValueSet( InputStream in, ImportOptions importOptions, TaskId id ); + ImportSummary saveDataValueSet( InputStream in, ImportOptions importOptions, TaskId id ); /** * Get data. Writes adx export data to output stream. diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultAdxDataService.java b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultAdxDataService.java index df4a4598..6989a205 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultAdxDataService.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultAdxDataService.java @@ -33,6 +33,11 @@ import org.amplecode.staxwax.factory.XMLFactory; import org.amplecode.staxwax.reader.XMLReader; import org.amplecode.staxwax.writer.XMLWriter; +import org.hisp.dhis.common.IdScheme; +import org.hisp.dhis.commons.collection.CachingMap; +import org.hisp.dhis.dxf2.importsummary.ImportCount; +import org.hisp.dhis.scheduling.TaskCategory; +import org.hisp.dhis.system.callable.IdentifiableObjectCallable; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -56,7 +61,6 @@ import org.hisp.dhis.dxf2.datavalueset.DataValueSetService; import org.hisp.dhis.dxf2.importsummary.ImportConflict; import org.hisp.dhis.dxf2.importsummary.ImportStatus; -import org.hisp.dhis.dxf2.importsummary.ImportSummaries; import org.hisp.dhis.dxf2.importsummary.ImportSummary; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.Period; @@ -89,6 +93,7 @@ import org.hisp.dhis.common.IdSchemes; import org.hisp.dhis.period.PeriodService; +import static org.apache.commons.lang3.StringUtils.trimToNull; import static org.hisp.dhis.system.notification.NotificationLevel.INFO; /** @@ -116,7 +121,7 @@ public class DefaultAdxDataService @Autowired private IdentifiableObjectManager identifiableObjectManager; - + @Autowired private SessionFactory sessionFactory; @@ -128,8 +133,8 @@ public class DefaultAdxDataService // ------------------------------------------------------------------------- @Override - public DataExportParams getFromUrl( Set dataSets, Set periods, Date startDate, Date endDate, - Set organisationUnits, boolean includeChildren, boolean includeDeleted, Date lastUpdated, Integer limit, IdSchemes outputIdSchemes ) + public DataExportParams getFromUrl( Set dataSets, Set periods, Date startDate, Date endDate, + Set organisationUnits, boolean includeChildren, boolean includeDeleted, Date lastUpdated, Integer limit, IdSchemes outputIdSchemes ) { DataExportParams params = new DataExportParams(); @@ -137,7 +142,7 @@ public DataExportParams getFromUrl( Set dataSets, Set periods, D { params.getDataSets().addAll( identifiableObjectManager.getByCode( DataSet.class, dataSets ) ); } - + if ( periods != null && !periods.isEmpty() ) { params.getPeriods().addAll( periodService.reloadIsoPeriods( new ArrayList<>( periods ) ) ); @@ -161,14 +166,14 @@ else if ( startDate != null && endDate != null ) return params; } - + @Override public void writeDataValueSet( DataExportParams params, OutputStream out ) throws AdxException { dataValueSetService.decideAccess( params ); dataValueSetService.validate( params ); - + XMLWriter adxWriter = XMLFactory.getXMLWriter( out ); adxWriter.openElement( AdxDataService.ROOT ); @@ -181,9 +186,9 @@ public void writeDataValueSet( DataExportParams params, OutputStream out ) DataElementCategoryCombo categoryCombo = dataSet.getCategoryCombo(); for ( DataElementCategoryOptionCombo aoc : categoryCombo.getOptionCombos() ) - { + { Map attributeDimensions = metadata.getExplodedCategoryAttributes(aoc.getId()); - + for ( OrganisationUnit orgUnit : params.getOrganisationUnits() ) { for ( Period period : params.getPeriods() ) @@ -192,7 +197,7 @@ public void writeDataValueSet( DataExportParams params, OutputStream out ) adxWriter.writeAttribute( AdxDataService.DATASET, dataSet.getCode() ); adxWriter.writeAttribute( AdxDataService.PERIOD, AdxPeriod.serialize( period ) ); adxWriter.writeAttribute( AdxDataService.ORGUNIT, orgUnit.getCode() ); - + for ( String attribute : attributeDimensions.keySet() ) { adxWriter.writeAttribute( attribute, attributeDimensions.get( attribute ) ); @@ -201,7 +206,7 @@ public void writeDataValueSet( DataExportParams params, OutputStream out ) for ( DataValue dv : dataValueService.getDataValues( orgUnit, period, dataSet.getDataElements(), aoc ) ) { adxWriter.openElement( AdxDataService.DATAVALUE ); - + adxWriter.writeAttribute( AdxDataService.DATAELEMENT, dv.getDataElement().getCode() ); DataElementCategoryOptionCombo coc = dv.getCategoryOptionCombo(); @@ -231,7 +236,7 @@ public void writeDataValueSet( DataExportParams params, OutputStream out ) } } } - + adxWriter.closeElement(); // ADX adxWriter.closeWriter(); @@ -239,111 +244,133 @@ public void writeDataValueSet( DataExportParams params, OutputStream out ) @Override @Transactional - public ImportSummaries saveDataValueSet( InputStream in, ImportOptions importOptions, TaskId id ) + public ImportSummary saveDataValueSet( InputStream in, ImportOptions importOptions, TaskId id ) { try { - in = StreamUtils.wrapAndCheckCompressionFormat( in ); + in = StreamUtils.wrapAndCheckCompressionFormat( in ); return saveDataValueSetInternal( in, importOptions, id ); } catch ( IOException ex ) { log.warn( "Import failed: " + DebugUtils.getStackTrace( ex ) ); - return new ImportSummaries().addImportSummary( new ImportSummary( ImportStatus.ERROR, "ADX import failed" ) ); + return new ImportSummary( ImportStatus.ERROR, "ADX import failed" ); } } - - private ImportSummaries saveDataValueSetInternal( InputStream in, ImportOptions importOptions, TaskId id ) + + private ImportSummary saveDataValueSetInternal( InputStream in, ImportOptions importOptions, TaskId id ) { notifier.clear( id ).notify( id, "ADX parsing process started" ); - + ImportOptions adxImportOptions = ObjectUtils.firstNonNull( importOptions, ImportOptions.getDefaultImportOptions() ) .instance().setNotificationLevel( NotificationLevel.OFF ); - + + // Get import options + IdScheme dataElementIdScheme = importOptions.getIdSchemes().getDataElementIdScheme(); + + // Create meta-data maps + CachingMap dataSetMap = new CachingMap<>(); + CachingMap dataElementMap = new CachingMap<>(); + + // Get meta-data maps + IdentifiableObjectCallable dataSetCallable = new IdentifiableObjectCallable<>( + identifiableObjectManager, DataSet.class, dataElementIdScheme, null ); + IdentifiableObjectCallable dataElementCallable = new IdentifiableObjectCallable<>( + identifiableObjectManager, DataElement.class, dataElementIdScheme, null ); + + // Heat cache + if ( importOptions.isPreheatCacheDefaultFalse() ) + { + dataSetMap.load( identifiableObjectManager.getAll( DataSet.class ), o -> o.getPropertyValue( dataElementIdScheme ) ); + dataElementMap.load( identifiableObjectManager.getAll( DataElement.class ), o -> o.getPropertyValue( dataElementIdScheme ) ); + } + XMLReader adxReader = XMLFactory.getXMLReader( in ); - ImportSummaries importSummaries = new ImportSummaries(); + ImportSummary importSummary; adxReader.moveToStartElement( AdxDataService.ROOT, AdxDataService.NAMESPACE ); ExecutorService executor = Executors.newSingleThreadExecutor(); - int count = 0; + // Give the DXF import a different notification task ID so it doesn't conflict with notifications from this level. + TaskId dxfTaskId = new TaskId( TaskCategory.DATAVALUE_IMPORT_INTERNAL, id.getUser() ); - // submit each ADX group to DXF importer as a datavalueSet - while ( adxReader.moveToStartElement( AdxDataService.GROUP, AdxDataService.NAMESPACE ) ) - { - try ( PipedOutputStream pipeOut = new PipedOutputStream() ) - { - notifier.notify( id, "Importing ADX data group: " + count ); - - Future futureImportSummary = executor.submit( new AdxPipedImporter( dataValueSetService, adxImportOptions, id, pipeOut, sessionFactory ) ); - XMLOutputFactory factory = XMLOutputFactory.newInstance(); - XMLStreamWriter dxfWriter = factory.createXMLStreamWriter( pipeOut ); + int groupCount = 0; - // note this returns conflicts which are detected at ADX level - List adxConflicts = parseAdxGroupToDxf( adxReader, dxfWriter, adxImportOptions ); + try ( PipedOutputStream pipeOut = new PipedOutputStream() ) + { + Future futureImportSummary = executor.submit( new AdxPipedImporter( + dataValueSetService, adxImportOptions, dxfTaskId, pipeOut, sessionFactory ) ); + XMLOutputFactory factory = XMLOutputFactory.newInstance(); + XMLStreamWriter dxfWriter = factory.createXMLStreamWriter( pipeOut ); - pipeOut.flush(); + List adxConflicts = new LinkedList<>(); - ImportSummary summary = futureImportSummary.get( TOTAL_MINUTES_TO_WAIT, TimeUnit.MINUTES ); + dxfWriter.writeStartDocument( "1.0" ); + dxfWriter.writeStartElement( "dataValueSet" ); + dxfWriter.writeDefaultNamespace( "http://dhis2.org/schema/dxf/2.0" ); - // add ADX conflicts to the import summary - for ( ImportConflict conflict : adxConflicts ) - { - summary.getConflicts().add( conflict ); - summary.getImportCount().incrementIgnored(); - } + notifier.notify( id, "Starting to import ADX data groups." ); - importSummaries.addImportSummary( summary ); - } - catch ( AdxException ex ) + while ( adxReader.moveToStartElement( AdxDataService.GROUP, AdxDataService.NAMESPACE ) ) { - ImportSummary importSummary = new ImportSummary(); - importSummary.setStatus( ImportStatus.ERROR ); - importSummary.setDescription( "Data set import failed for group number: " + count ); - importSummary.getConflicts().add( ex.getImportConflict() ); - importSummaries.addImportSummary( importSummary ); - importSummaries.setStatus( ImportStatus.ERROR ); - notifier.notify( id, NotificationLevel.ERROR, "ADX data import procss failed", true ); - log.warn( "Import failed: " + DebugUtils.getStackTrace( ex ) ); - } - catch ( IOException | XMLStreamException | InterruptedException | ExecutionException | TimeoutException ex ) - { - ImportSummary importSummary = new ImportSummary(); - importSummary.setStatus( ImportStatus.ERROR ); - importSummary.setDescription( "Data set import failed for group number: " + count ); - importSummaries.addImportSummary( importSummary ); - importSummaries.setStatus( ImportStatus.ERROR ); - notifier.notify( id, NotificationLevel.ERROR, "ADX data import procss failed", true ); - log.warn( "Import failed: " + DebugUtils.getStackTrace( ex ) ); + notifier.update( id, "Importing ADX data group: " + groupCount ); + + // note this returns conflicts which are detected at ADX level + adxConflicts.addAll( parseAdxGroupToDxf( adxReader, dxfWriter, adxImportOptions, + dataSetMap, dataSetCallable, dataElementMap, dataElementCallable) ); + groupCount++; } - count++; + dxfWriter.writeEndElement(); // end dataValueSet + dxfWriter.writeEndDocument(); + + pipeOut.flush(); + + importSummary = futureImportSummary.get( TOTAL_MINUTES_TO_WAIT, TimeUnit.MINUTES ); + importSummary.getConflicts().addAll( adxConflicts ); + importSummary.getImportCount().incrementIgnored( adxConflicts.size() ); + } + catch ( AdxException ex ) + { + importSummary = new ImportSummary(); + importSummary.setStatus( ImportStatus.ERROR ); + importSummary.setDescription( "Data set import failed within group number: " + groupCount ); + importSummary.getConflicts().add( ex.getImportConflict() ); + notifier.update( id, NotificationLevel.ERROR, "ADX data import done", true ); + log.warn( "Import failed: " + DebugUtils.getStackTrace( ex ) ); + } + catch ( IOException | XMLStreamException | InterruptedException | ExecutionException | TimeoutException ex ) + { + importSummary = new ImportSummary(); + importSummary.setStatus( ImportStatus.ERROR ); + importSummary.setDescription( "Data set import failed within group number: " + groupCount ); + notifier.update( id, NotificationLevel.ERROR, "ADX data import done", true ); + log.warn( "Import failed: " + DebugUtils.getStackTrace( ex ) ); } executor.shutdown(); - - notifier.notify( id, INFO, "ADX data import done", true ).addTaskSummary( id, importSummaries ); - log.info( "ADX data import done: " + importSummaries.toCountString() ); - return importSummaries; + notifier.update( id, INFO, "ADX data import done", true ).addTaskSummary( id, importSummary ); + + ImportCount c = importSummary.getImportCount(); + log.info( "ADX data import done, imported: " + c.getImported() + ", updated: " + c.getUpdated() + ", deleted: " + c.getDeleted() + ", ignored: " + c.getIgnored() ); + + return importSummary; } // ------------------------------------------------------------------------- // Utility methods // ------------------------------------------------------------------------- - private List parseAdxGroupToDxf( XMLReader adxReader, XMLStreamWriter dxfWriter, - ImportOptions importOptions ) - throws XMLStreamException, AdxException + private List parseAdxGroupToDxf( XMLReader adxReader, XMLStreamWriter dxfWriter, ImportOptions importOptions, + CachingMap dataSetMap, IdentifiableObjectCallable dataSetCallable, + CachingMap dataElementMap, IdentifiableObjectCallable dataElementCallable ) + throws XMLStreamException, AdxException { List adxConflicts = new LinkedList<>(); - dxfWriter.writeStartDocument( "1.0" ); - dxfWriter.writeStartElement( "dataValueSet" ); - dxfWriter.writeDefaultNamespace( "http://dhis2.org/schema/dxf/2.0" ); - IdentifiableProperty dataElementIdScheme = importOptions.getIdSchemes().getDataElementIdScheme() .getIdentifiableProperty(); @@ -371,8 +398,8 @@ private List parseAdxGroupToDxf( XMLReader adxReader, XMLStreamW { log.debug( "No attribute option combo present, check data set for attribute category combo" ); - DataSet dataSet = identifiableObjectManager.getObject( DataSet.class, dataElementIdScheme, - groupAttributes.get( AdxDataService.DATASET ) ); + String dataSetStr = trimToNull( groupAttributes.get( AdxDataService.DATASET ) ); + final DataSet dataSet = dataSetMap.get( dataSetStr, dataSetCallable.setId( dataSetStr ) ); if ( dataSet == null ) { @@ -385,18 +412,13 @@ private List parseAdxGroupToDxf( XMLReader adxReader, XMLStreamW convertAttributesToDxf( groupAttributes, AdxDataService.ATTOPTCOMBO, attributeCombo, dataElementIdScheme ); } - // write the remaining attributes through to DXF stream - for ( String attribute : groupAttributes.keySet() ) - { - dxfWriter.writeAttribute( attribute, groupAttributes.get( attribute ) ); - } - // process the dataValues while ( adxReader.moveToStartElement( AdxDataService.DATAVALUE, AdxDataService.GROUP ) ) { try { - parseADXDataValueToDxf( adxReader, dxfWriter, importOptions ); + parseADXDataValueToDxf( adxReader, dxfWriter, groupAttributes, importOptions, + dataElementMap, dataElementCallable ); } catch ( AdxException ex ) { @@ -406,13 +428,12 @@ private List parseAdxGroupToDxf( XMLReader adxReader, XMLStreamW } } - dxfWriter.writeEndElement(); - dxfWriter.writeEndDocument(); - return adxConflicts; } - private void parseADXDataValueToDxf( XMLReader adxReader, XMLStreamWriter dxfWriter, ImportOptions importOptions ) + private void parseADXDataValueToDxf( XMLReader adxReader, XMLStreamWriter dxfWriter, + Map groupAttributes, ImportOptions importOptions, + CachingMap dataElementMap, IdentifiableObjectCallable dataElementCallable ) throws XMLStreamException, AdxException { Map dvAttributes = adxReader.readAttributes(); @@ -432,8 +453,8 @@ private void parseADXDataValueToDxf( XMLReader adxReader, XMLStreamWriter dxfWri IdentifiableProperty dataElementIdScheme = importOptions.getIdSchemes().getDataElementIdScheme() .getIdentifiableProperty(); - DataElement dataElement = identifiableObjectManager.getObject( DataElement.class, dataElementIdScheme, - dvAttributes.get( AdxDataService.DATAELEMENT ) ); + String dataElementStr = trimToNull( dvAttributes.get( AdxDataService.DATAELEMENT ) ); + final DataElement dataElement = dataElementMap.get( dataElementStr, dataElementCallable.setId( dataElementStr ) ); if ( dataElement == null ) { @@ -446,7 +467,7 @@ private void parseADXDataValueToDxf( XMLReader adxReader, XMLStreamWriter dxfWri log.debug( "No category option combo present" ); //TODO expand to allow for category combos part of DataSetElements. - + DataElementCategoryCombo categoryCombo = dataElement.getDataElementCategoryCombo(); convertAttributesToDxf( dvAttributes, AdxDataService.CATOPTCOMBO, categoryCombo, dataElementIdScheme ); @@ -474,13 +495,19 @@ private void parseADXDataValueToDxf( XMLReader adxReader, XMLStreamWriter dxfWri dxfWriter.writeStartElement( "dataValue" ); + // write the group attributes through to DXF stream + for ( String attribute : groupAttributes.keySet() ) + { + dxfWriter.writeAttribute( attribute, groupAttributes.get( attribute ) ); + } + // pass through the remaining attributes to DXF for ( String attribute : dvAttributes.keySet() ) { dxfWriter.writeAttribute( attribute, dvAttributes.get( attribute ) ); } - dxfWriter.writeEndElement(); + dxfWriter.writeEndElement(); // dataValue } private Map getCodeCategoryMap( DataElementCategoryCombo categoryCombo ) @@ -508,15 +535,13 @@ private Map getCodeCategoryMap( DataElementCategory private DataElementCategoryOptionCombo getCatOptComboFromAttributes( Map attributes, DataElementCategoryCombo catcombo, IdentifiableProperty scheme ) - throws AdxException + throws AdxException { CategoryComboMap catcomboMap; try { catcomboMap = new CategoryComboMap( catcombo, scheme ); - log.debug( catcomboMap.toString() ); - } catch ( CategoryComboMapException ex ) { @@ -557,7 +582,7 @@ private DataElementCategoryOptionCombo getCatOptComboFromAttributes( Map attributes, String optionComboName, DataElementCategoryCombo catCombo, IdentifiableProperty scheme ) - throws AdxException + throws AdxException { log.debug( "ADX attributes: " + attributes ); diff --git a/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/InMemoryNotifier.java b/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/InMemoryNotifier.java index 283fcdd7..f682491d 100644 --- a/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/InMemoryNotifier.java +++ b/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/InMemoryNotifier.java @@ -77,24 +77,52 @@ public Notifier notify( TaskId id, NotificationLevel level, String message ) { return notify( id, level, message, false ); } - + @Override public Notifier notify( TaskId id, NotificationLevel level, String message, boolean completed ) { if ( id != null && !( level != null && level.isOff() ) ) { Notification notification = new Notification( level, id.getCategory(), new Date(), message, completed ); - + notifications.get( id ).add( 0, notification ); - + if ( notifications.get( id ).size() > MAX_SIZE ) { notifications.get( id ).remove( MAX_SIZE ); } - + log.info( notification ); } - + + return this; + } + + @Override + public Notifier update( TaskId id, String message ) + { + return update( id, NotificationLevel.INFO, message, false ); + } + + @Override + public Notifier update( TaskId id, NotificationLevel level, String message ) + { + return update( id, level, message, false ); + } + + @Override + public Notifier update( TaskId id, NotificationLevel level, String message, boolean completed ) + { + if ( id != null && !( level != null && level.isOff() ) ) + { + if ( notifications.get( id ).size() > 0 ) + { + notifications.get( id ).remove( notifications.get( id ).size() - 1 ); + } + + notify( id, level, message, completed ); + } + return this; } diff --git a/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/Notifier.java b/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/Notifier.java index a002472a..55bd4f47 100644 --- a/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/Notifier.java +++ b/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/Notifier.java @@ -42,7 +42,13 @@ public interface Notifier Notifier notify( TaskId id, NotificationLevel level, String message ); Notifier notify( TaskId id, NotificationLevel level, String message, boolean completed ); - + + Notifier update( TaskId id, String message ); + + Notifier update( TaskId id, NotificationLevel level, String message ); + + Notifier update( TaskId id, NotificationLevel level, String message, boolean completed ); + List getNotifications( TaskId id, String lastUid ); Notifier clear( TaskId id ); diff --git a/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueSetController.java b/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueSetController.java index 8b843047..48ffadf2 100644 --- a/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueSetController.java +++ b/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueSetController.java @@ -29,6 +29,8 @@ */ import org.apache.commons.io.IOUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.hibernate.SessionFactory; import org.hisp.dhis.common.IdSchemes; import org.hisp.dhis.dxf2.adx.AdxDataService; @@ -37,7 +39,6 @@ import org.hisp.dhis.dxf2.datavalueset.DataExportParams; import org.hisp.dhis.dxf2.datavalueset.DataValueSetService; import org.hisp.dhis.dxf2.datavalueset.tasks.ImportDataValueTask; -import org.hisp.dhis.dxf2.importsummary.ImportSummaries; import org.hisp.dhis.dxf2.importsummary.ImportSummary; import org.hisp.dhis.render.RenderService; import org.hisp.dhis.scheduling.TaskCategory; @@ -74,6 +75,8 @@ @ApiVersion( { ApiVersion.Version.DEFAULT, ApiVersion.Version.ALL } ) public class DataValueSetController { + private static final Log log = LogFactory.getLog( DataValueSetController.class ); + public static final String RESOURCE_PATH = "/dataValueSets"; @Autowired @@ -225,10 +228,19 @@ public void postAdxDataValueSet( ImportOptions importOptions, } else { - ImportSummaries summaries = adxDataService.saveDataValueSet( request.getInputStream(), importOptions, null ); - - response.setContentType( CONTENT_TYPE_XML ); - renderService.toXml( response.getOutputStream(), summaries ); + try + { + ImportSummary summary = adxDataService.saveDataValueSet( request.getInputStream(), importOptions, null ); + + response.setContentType( CONTENT_TYPE_XML ); + renderService.toXml( response.getOutputStream(), summary ); + } + catch ( Exception ex ) + { + log.error( "ADX Import error: ", ex ); + + throw ex; + } } } diff --git a/dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/adx/webapi/AdxController.java b/dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/adx/webapi/AdxController.java index f5784c83..b66a3b55 100644 --- a/dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/adx/webapi/AdxController.java +++ b/dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/adx/webapi/AdxController.java @@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFactory; import org.hisp.dhis.dxf2.adx.AdxDataService; import org.hisp.dhis.dxf2.common.ImportOptions; -import org.hisp.dhis.dxf2.importsummary.ImportSummaries; +import org.hisp.dhis.dxf2.importsummary.ImportSummary; import org.hisp.dhis.render.DefaultRenderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -66,11 +66,11 @@ public class AdxController public void postXMLDataValueSet( ImportOptions importOptions, HttpServletResponse response, InputStream in, Model model ) throws IOException { - ImportSummaries importSummaries = adxService.saveDataValueSet( in, importOptions, null ); + ImportSummary importSummary = adxService.saveDataValueSet( in, importOptions, null ); log.debug( "Data values set saved" ); response.setContentType( CONTENT_TYPE_XML ); - DefaultRenderService.getXmlMapper().writeValue( response.getOutputStream(), importSummaries ); + DefaultRenderService.getXmlMapper().writeValue( response.getOutputStream(), importSummary ); } } From f8ee052e8ff00caee213920318568918e6524ff3 Mon Sep 17 00:00:00 2001 From: Jim Grace Date: Wed, 12 Apr 2017 18:38:23 -0400 Subject: [PATCH 17/31] Resolve ADX speedup backport issue --- .../main/java/org/hisp/dhis/dxf2/adx/DefaultAdxDataService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultAdxDataService.java b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultAdxDataService.java index 6989a205..d3c4d6b4 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultAdxDataService.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultAdxDataService.java @@ -294,7 +294,7 @@ private ImportSummary saveDataValueSetInternal( InputStream in, ImportOptions im ExecutorService executor = Executors.newSingleThreadExecutor(); // Give the DXF import a different notification task ID so it doesn't conflict with notifications from this level. - TaskId dxfTaskId = new TaskId( TaskCategory.DATAVALUE_IMPORT_INTERNAL, id.getUser() ); + TaskId dxfTaskId = id == null ? null : new TaskId( TaskCategory.DATAVALUE_IMPORT_INTERNAL, id.getUser() ); int groupCount = 0; From ed34a924af3f58e16eeeb45858f6fba44919cd9e Mon Sep 17 00:00:00 2001 From: Jason Pickering Date: Wed, 12 Apr 2017 12:05:10 +0200 Subject: [PATCH 18/31] Strip newline characters in SQL views. (#710) * Strip newline characters in SQL views. * Added unit test * Added a space when replacing newlines to avoid potential syntax errors. --- .../org/hisp/dhis/sqlview/DefaultSqlViewService.java | 2 +- .../java/org/hisp/dhis/sqlview/SqlViewServiceTest.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java b/dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java index 98adc641..c71e8bae 100644 --- a/dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java +++ b/dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java @@ -245,7 +245,7 @@ public void validateSqlView( SqlView sqlView, Map criteria, Map< } final Set sqlVars = SqlViewUtils.getVariables( sqlView.getSqlQuery() ); - final String sql = sqlView.getSqlQuery().toLowerCase(); + final String sql = sqlView.getSqlQuery().replaceAll("\\r|\\n"," ").toLowerCase(); if ( !SELECT_PATTERN.matcher( sql ).matches() ) { diff --git a/dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/sqlview/SqlViewServiceTest.java b/dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/sqlview/SqlViewServiceTest.java index 73e81e1f..1ceb5f37 100644 --- a/dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/sqlview/SqlViewServiceTest.java +++ b/dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/sqlview/SqlViewServiceTest.java @@ -210,6 +210,15 @@ public void testValidateProtectedTables2() sqlViewService.validateSqlView( sqlView, null, null ); } + @Test( expected = IllegalQueryException.class ) + public void testValidateProtectedTables3() + { + SqlView sqlView = new SqlView( "Name", "select users.username \n FROM \"public\".users;", SqlViewType.QUERY ); + + sqlViewService.validateSqlView( sqlView, null, null ); + } + + @Test( expected = IllegalQueryException.class ) public void testValidateMissingVariables() { From 3fb4617e27ee8c9ad3bc9be208c6a96d32686116 Mon Sep 17 00:00:00 2001 From: Jason Pickering Date: Sun, 16 Apr 2017 08:51:48 +0200 Subject: [PATCH 19/31] Backport French translations in event charts and reports. (#724) --- .../i18n/i18n_app_fr.properties | 287 ++++++++++++++++++ .../i18n/i18n_app_fr.properties | 90 +++++- 2 files changed, 372 insertions(+), 5 deletions(-) create mode 100644 dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app_fr.properties diff --git a/dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app_fr.properties b/dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app_fr.properties new file mode 100644 index 00000000..96096eba --- /dev/null +++ b/dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app_fr.properties @@ -0,0 +1,287 @@ +dimensions=Dimensions +table_layout=Mise en page du tableau +show_totals=Afficher les totaux +show_subtotals=Afficher sous-totaux +hide_empty_rows=Cacher lignes vides +display_density=Afficher densit\u00E9 +font_size=Taille de la police +digit_group_separator=S\u00E9parateur des groupe de chiffres +comfortable=Comfortable +compact=Compact +large=Grand +small_=Petit +normal=Normal +reporting_period=P\u00E9riode de rapportage +organisation_unit=Unit\u00E9 d'organisation +organisation_units=Unit\u00E9s d'organisation +parent_organisation_unit=Unit\u00E9 d'organisation parent +user_organisation_unit=Unit\u00E9 d'organisation utilisateur +table_options=Options de la table +create=Cr\u00E9er +update=Mettre \u00E0 jour +cancel=Annuler +delete_=Supprimer +save=Enregistrer +hide=Masquer +add_new=Ajouter nouveau +manage_favorites=G\u00E9rer les favoris +search_for_favorites=Chercher les favoris +overwrite_favorite=Ecraser favori +delete_favorite=Supprimer favori +prev=Pr\u00E9c. +next=Suivant +rename=Renommer +overwrite=\u00C9craser +share_with_other_people=Partager avec d'autres personnes +sharing_settings=Param\u00E8tres de partage +can_view=Peut afficher +can_edit_and_view=Peut \u00E9diter et afficher +none=Aucun +public_access=Acc\u00E8s public +search_for_user_groups=Chercher les groupes d'utilisateurs +available=Disponible +selected=S\u00E9lectionn\u00E9 +indicators=Indicateurs +all_indicator_groups=Tous les groupes d'indicateurs +select_indicator_group=S\u00E9lectionner groupe d'indicateurs +data_elements=El\u00E9ments de donn\u00E9es +all_data_element_groups=Tous les groupes d'\u00E9l\u00E9ments de donn\u00E9es +select_data_element_group=S\u00E9lectionner groupe d'\u00E9l\u00E9ments de donn\u00E9es +data_sets=Ensemble de donn\u00E9es +reporting_rates=Taux de rapportage +periods=P\u00E9riodes +select_period_type=S\u00E9lectionner le type de p\u00E9riode +weeks=Semaines +last_week=Semaine derni\u00E8re +last_4_weeks=4 derni\u00E8res semaines +last_12_weeks=12 derni\u00E8res semaines +months=Mois +last_month=Mois dernier +last_3_months=3 derniers mois +last_12_months=12 derniers mois +bimonths=Bimensuel +last_bimonth=Dernier bi-mestre +last_6_bimonths=6 derniers bi-mestres +quarters=Trimestres +last_quarter=Trimestre pr\u00E9c\u00E9dent +last_4_quarters=4 derniers trimestres +sixmonths=Semestres +last_sixmonth=Dernier semestre +last_2_sixmonths=2 derniers semestres +years=Ann\u00E9es +this_year=Cette ann\u00E9e +last_year=Ann\u00E9e derni\u00E8re +last_5_years=5 derni\u00E8res ann\u00E9es +financial_years=Ann\u00E9es financi\u00E8res +last_financial_year=Ann\u00E9e fiscale pr\u00E9c\u00E9dente +last_5_financial_years=5 ann\u00E9es fiscales pr\u00E9c\u00E9dentes +prev_year=Ann\u00E9e pass\u00E9e +next_year=Ann\u00E9e suivante +select_all_children=S\u00E9lectionner tous les enfants +table=Tableau +chart=Graphique +map=Carte +home=Accueil +data=Donn\u00E9es +categories=Cat\u00E9gories +style=Style +parameters=Param\u00E8tres +for_standard_reports_only=pour rapports standards seuls +please_create_a_table_first=Veuillez d'abord cr\u00E9er un tableau +indicators_cannot_be_specified_as_filter=Les indicateurs ne peuvent \u00EAtre sp\u00E9cifi\u00E9s comme filtre +categories_cannot_be_specified_as_filter=Les cat\u00E9gories ne peuvent \u00EAtre sp\u00E9cifi\u00E9s comme filtre +data_element_group_sets_cannot_be_specified_together_with_data_sets=Les groupes d'\u00E9l\u00E9ments de donn\u00E9es ne peuvent \u00EAtre sp\u00E9cifi\u00E9s en m\u00EAme temps que les ensembles de donn\u00E9es +at_least_one_dimension_must_be_specified_as_row_or_column=Au moins une dimension doit \u00EAtre sp\u00E9cifi\u00E9e comme ligne ou colonne +at_least_one_period_must_be_specified_as_column_row_or_filter=Au moins une p\u00E9riode doit \u00EAtre sp\u00E9cifi\u00E9e comme ligne, colonne ou filtre +example1=Cr\u00E9er un rapport d'\u00E9v\u00E8nements +example2=S\u00E9lectionner des \u00E9l\u00E9ments des dimensions dans le menu de gauche +example3=Cliquer Mise en page pour r\u00E9arrange les dimensions comme lignes ou colonnes +example4=Cliquer Mettre \u00E0 jour pour cr\u00E9er la table +example5=Cr\u00E9er les rapports d'\u00E9v\u00E8nements +example6=Cliquer Options pour masquer les sous-totaux ou lignes vides, ajuster taille de police et autres +example7=Cliquer Favoris pour enregistrer votre tableau pour utilisation ult\u00E9rieure +example8=Cliquer T\u00E9l\u00E9charger pour enregistrer les donn\u00E9es du tableau +layout=Mise en page +options=Options +download=T\u00E9l\u00E9charger +favorites=Favoris +include_regression=Inclure r\u00E9gression +include_cumulative=Inclure cumul +sort_order=Ordre de tri +low_to_high=Valeurs basses vers \u00E9lev\u00E9es +high_to_low=Valeurs \u00E9lev\u00E9es vers basses +top_limit=Limite sup\u00E9rieure +plain_data_sources=Sourc de donn\u00E9es brutes +graphics=Graphisme +data_sets_cannot_be_specified_as_filter=Les ensembles de donn\u00E9es ne peuvent \u00EAtre sp\u00E9cifi\u00E9es comme filtre +share=Partager +interpretation=interpr\u00E9tation +write_your_interpretation=Ecrire un commentaire, question ou interpr\u00E9tation +legend_set=Jeu de l\u00E9gende +select_organisation_units=S\u00E9lectionner unit\u00E9s d'organisation +select_boundaries_and_levels=S\u00E9lectionner fronti\u00E8res et niveaux +select_organisation_unit_levels=S\u00E9lectionner niveaux d'unit\u00E9s d'organisation +totals=Totaux +details=D\u00E9tails +select_boundaries_and_groups=S\u00E9lectionner fronti\u00E8res et groupes +select_organisation_unit_groups=S\u00E9lectionner groupes d'unit\u00E9s d'organisation +allow_external_access=Permettre l'acc\u00E8s externe +show_hierarchy=Afficher l'hi\u00E9rarchie +all_indicators=Tous les indicateurs +all_data_elements=Tous les \u00E9l\u00E9ments de donn\u00E9es +daily=Quotidien +weekly=Hebdomadaire +monthly=Mensuel +bimonthly=Bimensuel +quarterly=Trimestriel +sixmonthly=Semestre +sixmonthly_april=Semestre avril +yearly=Annuel +financial_oct=Fiscale octobre +financial_july=Fiscale juillet +financial_april=Fiscale avril +plugin_config=Plugin config +default_=Par d\u00E9faut +aggregation_type=Type d'agr\u00E9gation +relative_periods=P\u00E9riodes relatives +start_end_dates=Dates d\u00E9but-fin +top=Haut +bottom=Bas +limit=Limite +go_to_event_charts=Aller dans le visualiseur d'\u00E9v\u00E8nements +open_this_table_as_chart=Ouvrir ce tableau sous forme de graphique +open_last_chart=Ouvrir dernier graphique +show_dimension_labels=Afficher \u00E9tiquettes dimensions +show_col_totals=Afficher totaux par colonne +show_row_totals=Afficher totaux par ligne +select_sub_units=S\u00E9lectionner sous-unit\u00E9s +you_do_not_have_access_to_all_items_in_this_favorite=Vous n'avez pas acc\u00E8s \u00E0 tous les \u00E9l\u00E9ments de ce favori +show_col_subtotals=Afficher sous-totaux par colonne +show_row_subtotals=Afficher sous-totaux par ligne +last_52_weeks=52 derni\u00E8res semaines +last_6_months=6 derniers mois +initializing=Initialisation en cours +created_by=Cr\u00E9\u00E9 par +clear_event_report=Effacer rapport des \u00E9v\u00E9nements +yes=Oui +no=Non +output_type=Type de sortie +event=\u00C9v\u00E8nement +tracked_entity_instance=Instance d'entit\u00E9 suivie +enrollment=Enr\u00F4lement +column_dimensions=Dimensions de colonnes +row_dimensions=Dimensions des lignes +report_filter=Filtre du rapport +average=Moyenne +count=Compte +sum=Somme +by_data_element=Par \u00E9l\u00E9ments de donn\u00E9es +stddev=Dev. Std. +variance=Variance +min=Min +max=Max +number_of_events=Nombre d'\u00E9v\u00E9nements +this_financial_year=Ann\u00E9e fiscale en cours +duplicate=Dupliquer +remove=Supprimer +select=S\u00E9lectionner +user_sub_units=Sous-unit\u00E9s de l'utilisateur +user_sub_x2_units=Sous-unit\u00E9s de l'utilisateur x2 +collapse_data_dimensions=R\u00E9duire dimensions donn\u00E9es +hide_na_data=Masquer donn\u00E9es n/a +this_week=Cette semaine +this_quarter=Ce trimestre +this_month=Ce mois +this_sixmonth=Ce semestre +this_bimonth=Ce bi-mestre +about=A propos +time_since_last_data_update=Temps \u00E9coul\u00E9 depuis derni\u00E8re mise \u00E0 jour donn\u00E9es +version=Version +revision=R\u00E9vision +build_time=Date de compilation +username=Nom d'utilisateur +no_values_found_for_current_selection=Pas de valeurs trouv\u00E9es pour la s\u00E9lection +error=Erreur +warning=Avertissement +excluded_dimensions=Exclure dimensions +completed_only=Seulement compl\u00E9t\u00E9s +include_only_completed_events_only=Inclure seulement les \u00E9v\u00E8nements compl\u00E9t\u00E9s +space=Espace +comma=Virgule +aggregated_values=Valeurs agr\u00E9g\u00E9es +show_aggregated_event_report=Afficher le rapport d'\u00E9v\u00E8nements agr\u00E9g\u00E9s +new_=Nouveau +open=Ouvrir +save_as=Enregistrer sous +get_link=Obtenir lien URL +embed=Embarquer +new_favorite=Nouveau favori +write_interpretation=Ecrire interpr\u00E9tation +open_favorite=Ouvrir favori +last_updated=Derni\u00E8re mise \u00E0 jour +name=Nom +save_favorite_as=Enregistrer le favori sous +all_unsaved_changes_will_be_discarded_continue=Toute modification non enregistr\u00E9e sera perdue. Continuer\u00A0? +existing_favorite_will_be_replaced_continue=Le favori actuel sera remplac\u00E9. Continuer ? +this_favorite_will_be_deleted_continue=Le favori actuel sera supprim\u00E9. Continuer ? +untitled=Sans titre +title=Titre +description=Description +unnamed=Sans nom +no_title=Pas de titre +no_description=Aucune description +show_favorites=Afficher les favoris +hide_favorites=Cacher les favoris +advanced=Avanc\u00E9 +data_value_set=Ensemble de valeurs de donn\u00E9es +other_formats=Autres formats +raw_data=Donn\u00E9es brutes +show_more=Afficher plus +show_less=Afficher moins +edit=\u00C9diter +change=modifier +public=Public +read=Lecture +read_write=Lecture/\u00C9criture +groups=groupes +group=Groupe +owner=Propri\u00E9taire +created=Cr\u00E9\u00E9 le +views=Vues +retrieving_number_of_views=En attente du nombre de vues... +sharing=Partage +no_current_favorite=Aucun favori actuel +post_comment=Publier le commentaire +more_comments=Plus de commentaires +unlike=Unlike +like=Like +people_like_this=personnes aiment ceci +people_commented=personnes ont comment\u00E9 +back_to_today=Revenir \u00E0 aujourd'hui +no_interpretations=Aucune interpr\u00E9tation +interpretations=Interpr\u00E9tations +comment=Commentaire +people=personnes +like_this=aiment ceci +ago=dans le pass\u00E9 +loading=Chargement +clear_interpretation=Effacer interpr\u00E9tation +general=G\u00E9n\u00E9ral +table_title=Titre du tableau +translate=Traduire +select_locale=S\u00E9lectionner la langue +no_translation_for_name=Aucune traduction pour le nom +no_translation_for_title=Aucune traduction pour le titre +no_translation_for_description=Aucune traduction pour la description +select_a_locale_to_enter_translations_for=S\u00E9lectionner la langue pour saisir les traductions +value=Valeur +background=Arri\u00E8re-plan +legend_display_style=Style de jeu de l\u00E9gende +days=Jours +today=Aujourd'hui +yesterday=Hier +last_3_days=3 derniers jours +last_7_days=7 derniers jours +last_14_days=14 dernier jours +download_data=T\u00E9l\u00E9charger les donn\u00E9es +metadata_id_scheme=Sch\u00E9ma ID des m\u00E9tadata diff --git a/dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app_fr.properties b/dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app_fr.properties index 75b26769..de8f7124 100644 --- a/dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app_fr.properties +++ b/dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app_fr.properties @@ -153,7 +153,7 @@ radar_chart=Graphique radar events=\u00C9v\u00E9nements tracked_entity_instances=Instances d'entit\u00E9s suivies count_type=Type de compte -trend_line=Trend lines +trend_line=Courbes de tendance hide_subtitle=Masquer sous-titre du graphique hide_legend=Masquer l\u00E9gende du graphique domain_axis_label=Titre de l'axe des abscisses @@ -231,7 +231,87 @@ error=Erreur warning=Avertissement completed_only=Compl\u00E9t\u00E9s seulement include_only_completed_events_only=Inclure seulement les \u00E9v\u00E8nements compl\u00E9t\u00E9s -selected_data_items=Selected data items -program=Program -stage=Stage -linear=Linear +selected_data_items=El\u00E9ments de donn\u00E9es selectionn\u00E9s +program=Programme +stage=Stade +linear=Lin\u00E9aire +series_dimensions=Dimensions des s\u00E9ries +category_dimensions=Dimensions des cat\u00E9gories +chart_layout=Mise en page du graphique +hide_empty_categories=Masquer les cat\u00E9gories vides +percent_stacked_values=Utiliser 100% valeurs empil\u00E9es +type=Type +new_=Nouveau +open=Ouvrir +save_as=Enregistrer sous +get_link=Obtenir le lien +embed=Embarquer +new_favorite=Nouveau favori +translate=Traduire +write_interpretation=Ecrire interpr\u00E9tation +open_favorite=Ouvrir favori +last_updated=Derni\u00E8re mise \u00E0 jour +name=Nom +save_favorite_as=Enregistrer le favori sous +all_unsaved_changes_will_be_discarded_continue=Toute modification non enregistr\u00E9e sera perdue. Continuer\u00A0? +existing_favorite_will_be_replaced_continue=Le favori actuel sera remplac\u00E9. Continuer ? +this_favorite_will_be_deleted_continue=Le favori actuel sera supprim\u00E9. Continuer ? +untitled=Sans titre +description=Description +unnamed=Sans nom +no_title=Pas de titre +no_description=Aucune description +show_favorites=Afficher les favoris +hide_favorites=Cacher les favoris +advanced=Avanc\u00E9 +data_value_set=Ensemble de valeurs de donn\u00E9es +other_formats=Autres formats +raw_data=Donn\u00E9es brutes +show_more=Afficher plus +show_less=Afficher moins +edit=\u00C9diter +change=modifier +public=Public +read=Lecture +read_write=Lecture/\u00C9criture +groups=groupes +group=Groupe +owner=Propri\u00E9taire +created=Cr\u00E9\u00E9 le +views=Vues +retrieving_number_of_views=En attente du nombre de vues... +sharing=Partage +no_current_favorite=Aucun favori actuel +post_comment=Publier un commentaire +more_comments=plus de commentaires +unlike=Unlike +like=Like +people_like_this=personnes aiment ceci +people_commented=personnes ont comment\u00E9 +back_to_today=Revenir \u00E0 aujourd'hui +no_interpretations=Aucune interpr\u00E9tation +interpretations=Interpr\u00E9tations +comment=Commentaire +people=personnes +like_this=aiment ceci +ago=avant +loading=Chargement +clear_interpretation=Effacer interpr\u00E9tation +table_title=Titre du tableau +select_locale=S\u00E9lectionner la langue +no_translation_for_name=Aucune traduction pour le nom +no_translation_for_title=Aucune traduction pour le titre +no_translation_for_description=Aucune traduction pour la traduction +select_a_locale_to_enter_translations_for=S\u00E9lectionner la langue pour saisir les traductions +background=Arri\u00E8re-plan +legend_display_style=Style de jeu de l\u00E9gende +days=Jours +today=Aujourd'hui +yesterday=Hier +last_3_days=3 derniers jours +last_7_days=7 derniers jours +last_14_days=14 derniers jours +download_data=T\u00E9l\u00E9charger les donn\u00E9es +metadata_id_scheme=Sch\u00E9ma ID des m\u00E9tadata +event_visualizer=Event Visualizer +image_png=Image From e514251fe4b719d43a129e1e09cee5c4d80c0519 Mon Sep 17 00:00:00 2001 From: vietnguyen Date: Mon, 17 Apr 2017 03:12:05 +0700 Subject: [PATCH 20/31] fix OU translation bug when expand subtree in user setting. (#718) --- .../src/main/webapp/dhis-web-commons/ouwt/responseExpand.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/responseExpand.vm b/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/responseExpand.vm index d50c14e5..07d216f4 100644 --- a/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/responseExpand.vm +++ b/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/responseExpand.vm @@ -3,7 +3,7 @@ #foreach( $parent in $parents ) #foreach( $child in $childrenMap.get( $parent ) ) - $encoder.xmlEncode( $child.name ) + $encoder.xmlEncode( $child.displayName ) #end #end From 6ddd7007f09f391d2141f9a2ee9ca3fc0dc8446e Mon Sep 17 00:00:00 2001 From: vietnguyen Date: Tue, 18 Apr 2017 12:59:32 +0700 Subject: [PATCH 21/31] Add lang attribute to html tag in main.vm (#728) --- .../src/main/webapp/main.vm | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm b/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm index 86d9f87f..eb532a66 100644 --- a/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm +++ b/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm @@ -1,8 +1,8 @@ - - - - + + + + $encoder.htmlEncode( $applicationTitle ) @@ -51,15 +51,15 @@ From 376180bc108af88dbf0e6361469439dc374f13e5 Mon Sep 17 00:00:00 2001 From: vietnguyen Date: Tue, 18 Apr 2017 13:00:57 +0700 Subject: [PATCH 22/31] Fix I18nAction to get list of DB Locale instead of UI Locale. (#722) --- .../main/java/org/hisp/dhis/i18n/action/I18nAction.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/I18nAction.java b/dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/I18nAction.java index ae0b923f..0645ef67 100644 --- a/dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/I18nAction.java +++ b/dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/I18nAction.java @@ -31,10 +31,12 @@ import com.opensymphony.xwork2.Action; import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.common.IdentifiableObjectManager; +import org.hisp.dhis.i18n.I18nLocaleService; import org.hisp.dhis.i18n.locale.LocaleManager; import org.hisp.dhis.user.UserSettingKey; import org.hisp.dhis.user.UserSettingService; import org.hisp.dhis.util.TranslationUtils; +import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; import java.util.Hashtable; @@ -96,6 +98,9 @@ public void setIdentifiableObjectManager( IdentifiableObjectManager identifiable this.identifiableObjectManager = identifiableObjectManager; } + @Autowired + private I18nLocaleService i18nLocaleService; + // ------------------------------------------------------------------------- // Input // ------------------------------------------------------------------------- @@ -181,7 +186,7 @@ public String execute() currentLocale = (Locale) userSettingService.getUserSetting( UserSettingKey.DB_LOCALE ); - availableLocales = localeManager.getAvailableLocales(); + availableLocales = i18nLocaleService.getAllLocales(); IdentifiableObject object = identifiableObjectManager.getObject( uid, className ); From c965b99ef4a3464761624fc311bd96f3e543f960 Mon Sep 17 00:00:00 2001 From: Morten Olav Hansen Date: Tue, 18 Apr 2017 10:18:49 +0200 Subject: [PATCH 23/31] adds Calendar.isValid(dt) to check if DateTimeUnit is valid within the current calendar (#734) --- .../hisp/dhis/calendar/AbstractCalendar.java | 16 ++++ .../java/org/hisp/dhis/calendar/Calendar.java | 8 ++ .../org/hisp/dhis/system/util/DateUtils.java | 33 ++++++- .../hisp/dhis/system/util/DateUtilsTest.java | 88 ++++++++++--------- 4 files changed, 100 insertions(+), 45 deletions(-) diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java index b94db05d..db9a3273 100644 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java +++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java @@ -263,4 +263,20 @@ public DateTimeUnit isoStartOfYear( int year ) { return new DateTimeUnit( year, 1, 1 ); } + + @Override + public boolean isValid( DateTimeUnit dateTime ) + { + if ( dateTime.getMonth() < 1 || dateTime.getMonth() > monthsInYear() ) + { + return false; + } + + if ( dateTime.getDay() < 1 || dateTime.getDay() > daysInMonth( dateTime.getYear(), dateTime.getMonth() ) ) + { + return false; + } + + return true; + } } diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/Calendar.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/Calendar.java index e052300d..ac9004fe 100644 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/Calendar.java +++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/Calendar.java @@ -407,4 +407,12 @@ public interface Calendar * @return */ DateTimeUnit isoStartOfYear( int year ); + + /** + * Is DateTimeUnit valid for this calendar. + * + * @param dateTime DateTime to check + * @return true if valid, false if not + */ + boolean isValid( DateTimeUnit dateTime ); } diff --git a/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java b/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java index 618d5b35..9ba06f5b 100644 --- a/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java +++ b/dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java @@ -29,6 +29,7 @@ */ import com.google.common.collect.ImmutableMap; +import org.hisp.dhis.calendar.DateTimeUnit; import org.hisp.dhis.i18n.I18nFormat; import org.hisp.dhis.indicator.Indicator; import org.hisp.dhis.period.Period; @@ -456,7 +457,9 @@ public static String getSqlDateString( Date date ) return yearString + "-" + monthString + "-" + dayString; } - private static final String DEFAULT_DATE_REGEX = "\\b\\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-2])\\b"; + private static final String DEFAULT_DATE_REGEX = "\\b(?\\d{4})-(?0[1-9]|1[0-2])-(?0[1-9]|[1-2][0-9]|3[0-2])\\b"; + + private static final Pattern DEFAULT_DATE_REGEX_PATTERN = Pattern.compile( DEFAULT_DATE_REGEX ); /** * This method checks whether the String inDate is a valid date following @@ -467,7 +470,33 @@ public static String getSqlDateString( Date date ) */ public static boolean dateIsValid( String dateString ) { - return dateString.matches( DEFAULT_DATE_REGEX ); + return dateIsValid( PeriodType.getCalendar(), dateString ); + } + + /** + * This method checks whether the String inDate is a valid date following + * the format "yyyy-MM-dd". + * + * @param calendar Calendar to be used + * @param dateString the string to be checked. + * @return true/false depending on whether the string is a date according to the format "yyyy-MM-dd". + */ + public static boolean dateIsValid( org.hisp.dhis.calendar.Calendar calendar, String dateString ) + { + Matcher matcher = DEFAULT_DATE_REGEX_PATTERN.matcher( dateString ); + + if ( !matcher.matches() ) + { + return false; + } + + DateTimeUnit dateTime = new DateTimeUnit( + Integer.valueOf( matcher.group( "year" ) ), + Integer.valueOf( matcher.group( "month" ) ), + Integer.valueOf( matcher.group( "day" ) ) + ); + + return calendar.isValid( dateTime ); } /** diff --git a/dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/DateUtilsTest.java b/dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/DateUtilsTest.java index ba8b1701..9ac53d27 100644 --- a/dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/DateUtilsTest.java +++ b/dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/DateUtilsTest.java @@ -28,23 +28,19 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.system.util.DateUtils.dateIsValid; -import static org.hisp.dhis.system.util.DateUtils.dateTimeIsValid; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNotNull; +import com.google.common.collect.Sets; +import org.hisp.dhis.calendar.impl.NepaliCalendar; +import org.joda.time.DateTime; +import org.junit.Test; import java.time.Duration; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.Date; -import org.joda.time.DateTime; -import org.junit.Test; - -import com.google.common.collect.Sets; +import static org.hisp.dhis.system.util.DateUtils.dateIsValid; +import static org.hisp.dhis.system.util.DateUtils.dateTimeIsValid; +import static org.junit.Assert.*; /** * @author Lars Helge Overland @@ -59,7 +55,6 @@ public void testDateIsValid() assertFalse( dateIsValid( "07-07-2000" ) ); assertFalse( dateIsValid( "2000-03-40" ) ); assertFalse( dateIsValid( "20d20-03-01" ) ); - assertTrue( dateIsValid( "0000-12-32" ) ); assertTrue( dateIsValid( "2014-01-01" ) ); assertFalse( dateIsValid( "2014-12-33" ) ); assertFalse( dateIsValid( "2014-13-32" ) ); @@ -67,6 +62,13 @@ public void testDateIsValid() assertFalse( dateIsValid( "201-01-01" ) ); assertFalse( dateIsValid( "01-01-01" ) ); assertFalse( dateIsValid( "abcd-01-01" ) ); + assertFalse( dateIsValid( "2017-04-31" ) ); + assertFalse( dateIsValid( "2017-04-32" ) ); + assertFalse( dateIsValid( "2016-09-31" ) ); + + assertTrue( dateIsValid( NepaliCalendar.getInstance(), "2074-04-32" ) ); + assertFalse( dateIsValid( NepaliCalendar.getInstance(), "2074-03-32" ) ); + assertFalse( dateIsValid( NepaliCalendar.getInstance(), "2074-04-33" ) ); } @Test @@ -84,13 +86,13 @@ public void testDateTimeIsValid() assertFalse( dateTimeIsValid( "01-01-2000" ) ); assertFalse( dateTimeIsValid( "abcd" ) ); } - + @Test public void testDaysBetween() { assertEquals( 6, DateUtils.daysBetween( new DateTime( 2014, 3, 1, 0, 0 ).toDate(), new DateTime( 2014, 3, 7, 0, 0 ).toDate() ) ); } - + @Test public void testMax() { @@ -98,15 +100,15 @@ public void testMax() Date date2 = new DateTime( 2014, 5, 18, 1, 1 ).toDate(); Date date3 = null; Date date4 = null; - + assertEquals( date2, DateUtils.max( date1, date2 ) ); assertEquals( date2, DateUtils.max( date2, date1 ) ); assertEquals( date1, DateUtils.max( date1, date3 ) ); assertEquals( date1, DateUtils.max( date3, date1 ) ); - + assertNull( DateUtils.max( date3, date4 ) ); } - + @Test public void testMaxCollection() { @@ -116,7 +118,7 @@ public void testMaxCollection() Date date4 = null; Date date5 = null; Date date6 = null; - + assertEquals( date2, DateUtils.max( Sets.newHashSet( date1, date2, date4 ) ) ); assertEquals( date2, DateUtils.max( Sets.newHashSet( date2, date1, date4 ) ) ); assertEquals( date3, DateUtils.max( Sets.newHashSet( date1, date2, date3 ) ) ); @@ -124,10 +126,10 @@ public void testMaxCollection() assertEquals( date3, DateUtils.max( Sets.newHashSet( date3, date4, date5 ) ) ); assertEquals( null, DateUtils.max( Sets.newHashSet( date4, date5, date6 ) ) ); assertEquals( date1, DateUtils.max( Sets.newHashSet( date1, date5, date4 ) ) ); - + assertNull( DateUtils.max( Sets.newHashSet( date4, date5, date6 ) ) ); } - + @Test public void testMin() { @@ -135,12 +137,12 @@ public void testMin() Date date2 = new DateTime( 2014, 5, 18, 1, 1 ).toDate(); Date date3 = null; Date date4 = null; - + assertEquals( date1, DateUtils.min( date1, date2 ) ); assertEquals( date1, DateUtils.min( date2, date1 ) ); assertEquals( date1, DateUtils.min( date1, date3 ) ); assertEquals( date1, DateUtils.min( date3, date1 ) ); - + assertNull( DateUtils.max( date3, date4 ) ); } @@ -153,7 +155,7 @@ public void testMinCollection() Date date4 = null; Date date5 = null; Date date6 = null; - + assertEquals( date1, DateUtils.min( Sets.newHashSet( date1, date2, date4 ) ) ); assertEquals( date1, DateUtils.min( Sets.newHashSet( date2, date1, date4 ) ) ); assertEquals( date1, DateUtils.min( Sets.newHashSet( date1, date2, date3 ) ) ); @@ -161,41 +163,41 @@ public void testMinCollection() assertEquals( date3, DateUtils.min( Sets.newHashSet( date3, date4, date5 ) ) ); assertEquals( null, DateUtils.min( Sets.newHashSet( date4, date5, date6 ) ) ); assertEquals( date1, DateUtils.min( Sets.newHashSet( date1, date5, date4 ) ) ); - + assertNull( DateUtils.max( Sets.newHashSet( date4, date5, date6 ) ) ); } - + @Test public void testGetPrettyInterval() { Date start = new DateTime( 2014, 5, 18, 15, 10, 5, 12 ).toDate(); Date end = new DateTime( 2014, 5, 19, 11, 45, 42, 56 ).toDate(); - + String interval = DateUtils.getPrettyInterval( start, end ); - + assertNotNull( interval ); } @Test public void testGetMediumDate() - { + { assertEquals( new DateTime( 2014, 5, 18, 0, 0, 0, 0 ).toDate(), DateUtils.getMediumDate( "2014-05-18" ) ); assertEquals( new DateTime( 2015, 11, 3, 0, 0, 0, 0 ).toDate(), DateUtils.getMediumDate( "2015-11-03" ) ); - + assertNull( DateUtils.getMediumDate( null ) ); } - + @Test( expected = IllegalArgumentException.class ) public void testGetInvalidMediumDate() { DateUtils.getMediumDate( "StringWhichIsNotADate" ); } - + @Test public void testGetMediumDateString() { Date date = new DateTime( 2014, 5, 18, 15, 10, 5, 12 ).toDate(); - + assertEquals( "2014-05-18", DateUtils.getMediumDateString( date ) ); assertNull( DateUtils.getMediumDateString( null ) ); } @@ -204,20 +206,20 @@ public void testGetMediumDateString() public void testGetLongDateString() { Date date = new DateTime( 2014, 5, 18, 15, 10, 5, 12 ).toDate(); - + assertEquals( "2014-05-18T15:10:05", DateUtils.getLongDateString( date ) ); assertNull( DateUtils.getLongDateString( null ) ); } - + @Test public void testGetHttpDateString() { Date date = new DateTime( 2014, 5, 18, 15, 10, 5, 12 ).toDate(); - + assertEquals( "Sun, 18 May 2014 15:10:05 GMT", DateUtils.getHttpDateString( date ) ); - assertNull( DateUtils.getLongDateString( null ) ); + assertNull( DateUtils.getLongDateString( null ) ); } - + @Test public void testGetDuration() { @@ -225,24 +227,24 @@ public void testGetDuration() Duration m20 = DateUtils.getDuration( "20m" ); Duration h2 = DateUtils.getDuration( "2h" ); Duration d14 = DateUtils.getDuration( "14d" ); - + assertEquals( 50, s50.getSeconds() ); assertEquals( 1200, m20.getSeconds() ); assertEquals( 7200, h2.getSeconds() ); assertEquals( 1209600, d14.getSeconds() ); - + assertNull( DateUtils.getDuration( "123x" ) ); assertNull( DateUtils.getDuration( "1y" ) ); assertNull( DateUtils.getDuration( "10ddd" ) ); } - + @Test public void getDate() { LocalDateTime time = LocalDateTime.of( 2012, 1, 10, 10, 5 ); - + Date date = DateUtils.getDate( time ); - - assertEquals( time.toInstant( ZoneOffset.UTC ).toEpochMilli(), date.getTime() ); + + assertEquals( time.toInstant( ZoneOffset.UTC ).toEpochMilli(), date.getTime() ); } } From 41c0625e5f69fd7ce56710fdb397437c10ac3729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= Date: Tue, 18 Apr 2017 16:55:04 +0200 Subject: [PATCH 24/31] Data value sync, bugfix, not counting deleted values --- .../hisp/dhis/datavalue/DataValueService.java | 3 +- .../hisp/dhis/datavalue/DataValueStore.java | 3 +- .../datavalue/DefaultDataValueService.java | 6 ++-- .../hibernate/HibernateDataValueStore.java | 8 ++++-- .../dhis/datavalue/DataValueServiceTest.java | 28 +++++++++++++++++++ .../version/MetadataVersionDelegate.java | 1 + .../synch/DefaultSynchronizationManager.java | 2 +- .../objectbundle/ObjectBundleServiceTest.java | 1 - .../org/hisp/dhis/i18n/action/I18nAction.java | 8 ------ .../main/resources/META-INF/dhis/beans.xml | 1 - .../scheduling/ScheduleTasksAction.java | 1 - 11 files changed, 43 insertions(+), 19 deletions(-) diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java index af30cb1c..9ac25606 100644 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java +++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java @@ -211,9 +211,10 @@ List getRecursiveDeflatedDataValues( DataElement dataElement, DataEle * date time. * * @param date the date time. + * @param includeDeleted whether to include deleted data values. * @return the number of DataValues. */ - int getDataValueCountLastUpdatedAfter( Date date ); + int getDataValueCountLastUpdatedAfter( Date date, boolean includeDeleted ); /** * Returns a map of values for each attribute option combo found. diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueStore.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueStore.java index 237b0cb4..0b50b23b 100644 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueStore.java +++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueStore.java @@ -188,9 +188,10 @@ List sumRecursiveDeflatedDataValues( * date time. * * @param date the date time. + * @param includeDeleted whether to include deleted data values. * @return the number of DataValues. */ - int getDataValueCountLastUpdatedAfter( Date date ); + int getDataValueCountLastUpdatedAfter( Date date, boolean includeDeleted ); /** * Returns a map of values for each attribute option combo found. diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DefaultDataValueService.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DefaultDataValueService.java index 00bacb8f..a3ccb61e 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DefaultDataValueService.java +++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DefaultDataValueService.java @@ -385,13 +385,13 @@ public int getDataValueCount( int days ) Calendar cal = PeriodType.createCalendarInstance(); cal.add( Calendar.DAY_OF_YEAR, (days * -1) ); - return dataValueStore.getDataValueCountLastUpdatedAfter( cal.getTime() ); + return dataValueStore.getDataValueCountLastUpdatedAfter( cal.getTime(), false ); } @Override - public int getDataValueCountLastUpdatedAfter( Date date ) + public int getDataValueCountLastUpdatedAfter( Date date, boolean includeDeleted ) { - return dataValueStore.getDataValueCountLastUpdatedAfter( date ); + return dataValueStore.getDataValueCountLastUpdatedAfter( date, includeDeleted ); } @Override diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueStore.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueStore.java index 9a176b2a..b2155be0 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueStore.java +++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueStore.java @@ -361,13 +361,17 @@ public List sumRecursiveDeflatedDataValues( } @Override - public int getDataValueCountLastUpdatedAfter( Date date ) + public int getDataValueCountLastUpdatedAfter( Date date, boolean includeDeleted ) { Criteria criteria = sessionFactory.getCurrentSession() .createCriteria( DataValue.class ) .add( Restrictions.ge( "lastUpdated", date ) ) - .add( Restrictions.eq( "deleted", false ) ) .setProjection( Projections.rowCount() ); + + if ( !includeDeleted ) + { + criteria.add( Restrictions.eq( "deleted", false ) ); + } Number rs = (Number) criteria.uniqueResult(); diff --git a/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueServiceTest.java b/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueServiceTest.java index 75f92f4c..cb3d15f1 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueServiceTest.java +++ b/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueServiceTest.java @@ -31,6 +31,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.util.Date; import java.util.List; import org.hisp.dhis.DhisSpringTest; @@ -320,4 +323,29 @@ public void testGetDataValuesDataElementsPeriodsOrgUnits() assertEquals( 1, dataValueService.getDataValues( Sets.newHashSet( dataElementA ), Sets.newHashSet( periodA ), Sets.newHashSet( sourceB ) ).size() ); assertEquals( dataValueB, dataValueService.getDataValues( Sets.newHashSet( dataElementA ), Sets.newHashSet( periodA ), Sets.newHashSet( sourceB ) ).iterator().next() ); } + + @Test + public void testGetDataValueCountLastUpdatedBetween() + { + DataValue dataValueA = new DataValue( dataElementA, periodA, sourceA, optionCombo, optionCombo, "1", "userA", new Date(), "Comment" ); + DataValue dataValueB = new DataValue( dataElementA, periodA, sourceB, optionCombo, optionCombo, "2", "userA", new Date(), "Comment" ); + DataValue dataValueC = new DataValue( dataElementA, periodB, sourceA, optionCombo, optionCombo, "3", "userA", new Date(), "Comment" ); + + assertTrue( dataValueService.addDataValue( dataValueA ) ); + assertTrue( dataValueService.addDataValue( dataValueB ) ); + assertTrue( dataValueService.addDataValue( dataValueC ) ); + + assertEquals( 3, dataValueService.getDataValueCountLastUpdatedAfter( getDate( 1970, 1, 1 ), false ) ); + assertEquals( 3, dataValueService.getDataValueCountLastUpdatedAfter( getDate( 1970, 1, 1 ), true ) ); + + dataValueService.deleteDataValue( dataValueC ); + + assertEquals( 3, dataValueService.getDataValueCountLastUpdatedAfter( getDate( 1970, 1, 1 ), true ) ); + assertEquals( 2, dataValueService.getDataValueCountLastUpdatedAfter( getDate( 1970, 1, 1 ), false ) ); + + dataValueService.deleteDataValue( dataValueB ); + + assertEquals( 3, dataValueService.getDataValueCountLastUpdatedAfter( getDate( 1970, 1, 1 ), true ) ); + assertEquals( 1, dataValueService.getDataValueCountLastUpdatedAfter( getDate( 1970, 1, 1 ), false ) ); + } } diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/version/MetadataVersionDelegate.java b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/version/MetadataVersionDelegate.java index e41bc09a..2a4680e9 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/version/MetadataVersionDelegate.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/version/MetadataVersionDelegate.java @@ -25,6 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + package org.hisp.dhis.dxf2.metadata.version; import org.apache.commons.logging.Log; diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java index 189a0d86..745fa15d 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java @@ -229,7 +229,7 @@ private ImportSummary executeDataPush( SystemInstance instance ) final Date startTime = new Date(); final Date lastSuccessTime = getLastSynchSuccessFallback(); - final int lastUpdatedCount = dataValueService.getDataValueCountLastUpdatedAfter( lastSuccessTime ); + final int lastUpdatedCount = dataValueService.getDataValueCountLastUpdatedAfter( lastSuccessTime, true ); log.info( "Values: " + lastUpdatedCount + " since last synch success: " + lastSuccessTime ); diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/objectbundle/ObjectBundleServiceTest.java b/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/objectbundle/ObjectBundleServiceTest.java index c4e773e5..a3f6783d 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/objectbundle/ObjectBundleServiceTest.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/objectbundle/ObjectBundleServiceTest.java @@ -1384,7 +1384,6 @@ public void testCreateAndUpdateDataSetWithSections() throws IOException ObjectBundle bundle = objectBundleService.create( params ); ObjectBundleValidationReport validate = objectBundleValidationService.validate( bundle ); - System.err.println( "V: " + validate.getErrorReports() ); assertTrue( validate.getErrorReports().isEmpty() ); objectBundleService.commit( bundle ); diff --git a/dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/I18nAction.java b/dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/I18nAction.java index 0645ef67..522df2ab 100644 --- a/dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/I18nAction.java +++ b/dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/I18nAction.java @@ -32,7 +32,6 @@ import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.common.IdentifiableObjectManager; import org.hisp.dhis.i18n.I18nLocaleService; -import org.hisp.dhis.i18n.locale.LocaleManager; import org.hisp.dhis.user.UserSettingKey; import org.hisp.dhis.user.UserSettingService; import org.hisp.dhis.util.TranslationUtils; @@ -77,13 +76,6 @@ public class I18nAction // Dependencies // ------------------------------------------------------------------------- - private LocaleManager localeManager; - - public void setLocaleManager( LocaleManager localeManager ) - { - this.localeManager = localeManager; - } - private UserSettingService userSettingService; public void setUserSettingService( UserSettingService userSettingService ) diff --git a/dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml b/dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml index ea1d4cc0..06e6f81d 100644 --- a/dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml +++ b/dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml @@ -259,7 +259,6 @@ - diff --git a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/scheduling/ScheduleTasksAction.java b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/scheduling/ScheduleTasksAction.java index 34f0d95a..aa453562 100644 --- a/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/scheduling/ScheduleTasksAction.java +++ b/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/scheduling/ScheduleTasksAction.java @@ -63,7 +63,6 @@ import static org.hisp.dhis.system.scheduling.Scheduler.CRON_DAILY_7AM; import static org.hisp.dhis.system.scheduling.Scheduler.CRON_DAILY_8AM; import static org.hisp.dhis.system.scheduling.Scheduler.CRON_EVERY_15MIN; -import static org.hisp.dhis.system.scheduling.Scheduler.CRON_EVERY_MIN; /** * @author Lars Helge Overland From 1575b673fa4838426499597ab39c3de36725fc24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= Date: Wed, 19 Apr 2017 12:01:49 +0200 Subject: [PATCH 25/31] Data import, fixed bug, allow import of deleted null values (cherry picked from commit 7928153c1f1d303200ec3e62050b55e3b60ade21) --- .../java/org/hisp/dhis/dxf2/datavalue/DataValue.java | 11 +++++++++++ .../dxf2/datavalueset/DefaultDataValueSetService.java | 3 ++- .../dxf2/datavalueset/DataValueSetServiceTest.java | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java index 93deae3c..d2f06fd8 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java @@ -103,6 +103,17 @@ public String getPrimaryKey() .toArray(), DimensionalObject.DIMENSION_SEP ); } + public boolean isNullValue() + { + return getValue() == null && getComment() == null; + } + + public boolean isDeletedValue() + { + Boolean deleted = getDeleted(); + return deleted != null && deleted; + } + @Override public String toString() { diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java index b7e50691..871897e0 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java @@ -855,8 +855,9 @@ else if ( dataValueSet.getAttributeCategoryOptions() != null ) continue; } - if ( dataValue.getValue() == null && dataValue.getComment() == null ) + if ( dataValue.isNullValue() && !dataValue.isDeletedValue() ) { + summary.getConflicts().add( new ImportConflict( "Value", "Data value or comment not specified for data element: " + dataElement.getUid() ) ); continue; } diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java b/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java index 608cc36d..f0085c92 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java @@ -914,7 +914,7 @@ public void testImportNullDataValues() assertEquals( ImportStatus.SUCCESS, summary.getStatus() ); assertEquals( 2, summary.getImportCount().getIgnored() ); assertEquals( 1, summary.getImportCount().getImported() ); - assertEquals( summary.getConflicts().toString(), 0, summary.getConflicts().size() ); + assertEquals( summary.getConflicts().toString(), 2, summary.getConflicts().size() ); Collection dataValues = mockDataValueBatchHandler.getInserts(); From 0cad4761793cf0315a8e25b17db87f83202ecc6c Mon Sep 17 00:00:00 2001 From: Hari krishna Date: Thu, 20 Apr 2017 15:34:53 +0530 Subject: [PATCH 26/31] Fix to handle uid collisons across different entities (#739) --- .../dhis/webapi/controller/AbstractCrudController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java b/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java index 4da191b2..2593ae27 100644 --- a/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java +++ b/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java @@ -595,7 +595,7 @@ public void postJsonObject( HttpServletRequest request, HttpServletResponse resp webMessage.setHttpStatus( HttpStatus.CREATED ); response.setHeader( "Location", contextService.getApiPath() + getSchema().getRelativeApiEndpoint() + "/" + objectReport.getUid() ); - T entity = manager.get( objectReport.getUid() ); + T entity = manager.get( getEntityClass(), objectReport.getUid() ); postCreateEntity( entity ); } @@ -634,7 +634,7 @@ public void postXmlObject( HttpServletRequest request, HttpServletResponse respo response.setHeader( "Location", contextService.getApiPath() + getSchema().getRelativeApiEndpoint() + "/" + objectReport.getUid() ); - T entity = manager.get( objectReport.getUid() ); + T entity = manager.get( getEntityClass(), objectReport.getUid() ); postCreateEntity( entity ); } @@ -692,7 +692,7 @@ public void putJsonObject( @PathVariable( "uid" ) String pvUid, HttpServletReque if ( importReport.getStatus() == Status.OK ) { - T entity = manager.get( pvUid ); + T entity = manager.get( getEntityClass(), pvUid ); postUpdateEntity( entity ); } @@ -732,7 +732,7 @@ public void putXmlObject( @PathVariable( "uid" ) String pvUid, HttpServletReques if ( importReport.getStatus() == Status.OK ) { - T entity = manager.get( pvUid ); + T entity = manager.get( getEntityClass(), pvUid ); postUpdateEntity( entity ); } From 38ea2443060bb7f42ffe3e2d706d356bef504fad Mon Sep 17 00:00:00 2001 From: Bekkalizer Date: Thu, 20 Apr 2017 16:07:33 +0200 Subject: [PATCH 27/31] removed ProgramValidations --- .../dhis2/dhis2.angular.services.js | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js b/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js index 97dd3dd1..0b50322a 100644 --- a/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js +++ b/dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js @@ -1330,18 +1330,16 @@ var d2Services = angular.module('d2Services', ['ngResource']) }); var programIndicators = {rules:programRules, variables:variables}; - - MetaDataFactory.getByProgram('programValidations',programUid).then(function(programValidations){ - MetaDataFactory.getByProgram('programRuleVariables',programUid).then(function(programVariables){ - MetaDataFactory.getByProgram('programRules',programUid).then(function(prs){ - var programRules = []; - angular.forEach(prs, function(rule){ - rule.actions = []; - rule.programStageId = rule.programStage && rule.programStage.id ? rule.programStage.id : null; - programRules.push(rule); - }); - def.resolve({constants: constants, programIndicators: programIndicators, programValidations: programValidations, programVariables: programVariables, programRules: programRules}); - }); + + MetaDataFactory.getByProgram('programRuleVariables',programUid).then(function(programVariables){ + MetaDataFactory.getByProgram('programRules',programUid).then(function(prs){ + var programRules = []; + angular.forEach(prs, function(rule){ + rule.actions = []; + rule.programStageId = rule.programStage && rule.programStage.id ? rule.programStage.id : null; + programRules.push(rule); + }); + def.resolve({constants: constants, programIndicators: programIndicators, programVariables: programVariables, programRules: programRules}); }); }); }); From a1259729c749cbf26289aab4e9e4e1568c175d63 Mon Sep 17 00:00:00 2001 From: Morten Olav Hansen Date: Fri, 21 Apr 2017 09:49:12 +0200 Subject: [PATCH 28/31] minor fix, check for both implicit authority and user equality for canUpdate (#746) --- .../dhis/security/acl/DefaultAclService.java | 23 ++++- .../dhis/security/acl/AclServiceTest.java | 90 +++++++++++++++++++ 2 files changed, 109 insertions(+), 4 deletions(-) diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/acl/DefaultAclService.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/acl/DefaultAclService.java index 0ea64983..579d613a 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/acl/DefaultAclService.java +++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/acl/DefaultAclService.java @@ -195,11 +195,16 @@ public boolean canUpdate( User user, IdentifiableObject object ) } List anyAuthorities = schema.getAuthorityByType( AuthorityType.UPDATE ); - anyAuthorities.addAll( schema.getAuthorityByType( AuthorityType.CREATE ) ); - anyAuthorities.addAll( schema.getAuthorityByType( AuthorityType.CREATE_PRIVATE ) ); - anyAuthorities.addAll( schema.getAuthorityByType( AuthorityType.CREATE_PUBLIC ) ); - return schema.isImplicitPrivateAuthority() || canAccess( user, anyAuthorities ) && (!schema.isShareable() || canWrite( user, object )); + if ( anyAuthorities.isEmpty() ) + { + anyAuthorities.addAll( schema.getAuthorityByType( AuthorityType.CREATE ) ); + anyAuthorities.addAll( schema.getAuthorityByType( AuthorityType.CREATE_PRIVATE ) ); + anyAuthorities.addAll( schema.getAuthorityByType( AuthorityType.CREATE_PUBLIC ) ); + } + + return (schema.isImplicitPrivateAuthority() && userCheck( user, object )) + || canAccess( user, anyAuthorities ) && (!schema.isShareable() || canWrite( user, object )); } @Override @@ -432,4 +437,14 @@ public List verifySharing( T object, return errorReports; } + + private boolean userCheck( User user, IdentifiableObject object ) + { + if ( user == null || object.getUser() == null ) + { + return false; + } + + return user.equals( object.getUser() ); + } } diff --git a/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/security/acl/AclServiceTest.java b/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/security/acl/AclServiceTest.java index 9bee6e01..edbefd08 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/security/acl/AclServiceTest.java +++ b/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/security/acl/AclServiceTest.java @@ -28,11 +28,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Sets; import org.hisp.dhis.DhisSpringTest; import org.hisp.dhis.chart.Chart; import org.hisp.dhis.common.IdentifiableObjectManager; import org.hisp.dhis.dashboard.Dashboard; import org.hisp.dhis.dataelement.DataElement; +import org.hisp.dhis.dataelement.DataElementCategoryOption; import org.hisp.dhis.eventchart.EventChart; import org.hisp.dhis.eventreport.EventReport; import org.hisp.dhis.legend.LegendSet; @@ -48,6 +50,7 @@ import java.util.HashSet; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -421,4 +424,91 @@ public void testSharingPrivateRW() assertTrue( aclService.canUpdate( user2, dataElement ) ); } + + @Test + public void testCategoryOptionSharingPrivateRW() + { + User user1 = createUser( "user1", "F_CATEGORY_OPTION_PRIVATE_ADD" ); + User user2 = createUser( "user2" ); + + DataElementCategoryOption categoryOption = createCategoryOption( 'A' ); + categoryOption.setUser( user1 ); + manager.save( categoryOption ); + + assertFalse( aclService.canUpdate( user2, categoryOption ) ); + assertEquals( AccessStringHelper.DEFAULT, categoryOption.getPublicAccess() ); + + UserGroup userGroup = createUserGroup( 'A', new HashSet<>() ); + userGroup.getMembers().add( user1 ); + userGroup.getMembers().add( user2 ); + + manager.save( userGroup ); + + categoryOption.getUserGroupAccesses().add( new UserGroupAccess( userGroup, "rw------" ) ); + manager.update( categoryOption ); + + assertTrue( aclService.canUpdate( user2, categoryOption ) ); + } + + @Test + public void testUserCanUpdateDashboard() + { + User user1 = createUser( 'A' ); + User user2 = createUser( 'B' ); + + manager.save( user1 ); + manager.save( user2 ); + + Dashboard dashboard = new Dashboard( "Dashboard" ); + dashboard.setUser( user1 ); + + manager.save( dashboard ); + + assertTrue( aclService.canRead( user1, dashboard ) ); + assertTrue( aclService.canUpdate( user1, dashboard ) ); + assertTrue( aclService.canDelete( user1, dashboard ) ); + assertTrue( aclService.canManage( user1, dashboard ) ); + + assertFalse( aclService.canRead( user2, dashboard ) ); + assertFalse( aclService.canUpdate( user2, dashboard ) ); + assertFalse( aclService.canDelete( user2, dashboard ) ); + assertFalse( aclService.canManage( user2, dashboard ) ); + } + + @Test + public void testUserCanUpdateDashboardSharedWithUserGroup() + { + User user1 = createUser( 'A' ); + User user2 = createUser( 'B' ); + + manager.save( user1 ); + manager.save( user2 ); + + UserGroup userGroup = createUserGroup( 'A', Sets.newHashSet( user1, user2 ) ); + manager.save( userGroup ); + + Dashboard dashboard = new Dashboard( "Dashboard" ); + dashboard.setUser( user1 ); + manager.save( dashboard ); + + UserGroupAccess userGroupAccess = new UserGroupAccess( userGroup, AccessStringHelper.READ ); + dashboard.getUserGroupAccesses().add( userGroupAccess ); + manager.update( dashboard ); + + assertTrue( aclService.canRead( user1, dashboard ) ); + assertTrue( aclService.canUpdate( user1, dashboard ) ); + assertTrue( aclService.canDelete( user1, dashboard ) ); + assertTrue( aclService.canManage( user1, dashboard ) ); + + Access access = aclService.getAccess( dashboard, user2 ); + assertTrue( access.isRead() ); + assertFalse( access.isUpdate() ); + assertFalse( access.isDelete() ); + assertFalse( access.isManage() ); + + assertTrue( aclService.canRead( user2, dashboard ) ); + assertFalse( aclService.canUpdate( user2, dashboard ) ); + assertFalse( aclService.canDelete( user2, dashboard ) ); + assertFalse( aclService.canManage( user2, dashboard ) ); + } } From 106a90413dd48a8a30b9f6eebdef381a8679566c Mon Sep 17 00:00:00 2001 From: Morten Olav Hansen Date: Fri, 21 Apr 2017 10:27:17 +0200 Subject: [PATCH 29/31] backport of AclService from 226/master --- .../hisp/dhis/security/acl/AclService.java | 7 ++-- .../dhis/security/DefaultSecurityService.java | 39 +++++++++---------- .../dhis/security/acl/DefaultAclService.java | 26 ++++++------- .../dhis/security/acl/AclServiceTest.java | 32 +++++++-------- .../dhis/hibernate/HibernateGenericStore.java | 8 ++-- 5 files changed, 54 insertions(+), 58 deletions(-) diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/acl/AclService.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/acl/AclService.java index 4a4c7cdf..c2c48bc3 100644 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/acl/AclService.java +++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/acl/AclService.java @@ -28,7 +28,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.common.BaseIdentifiableObject; import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.feedback.ErrorReport; import org.hisp.dhis.user.User; @@ -166,7 +165,7 @@ public interface AclService * @param klass Class to check * @return Result of test */ - boolean canCreatePublic( User user, Class klass ); + boolean canMakePublic( User user, Class klass ); /** * Checks if a user can create a private instance of a certain object. @@ -178,7 +177,7 @@ public interface AclService * @param klass Class to check * @return Result of test */ - boolean canCreatePrivate( User user, Class klass ); + boolean canMakePrivate( User user, Class klass ); /** * Can user make this object external? (read with no login) @@ -187,7 +186,7 @@ public interface AclService * @param klass Type to check * @return Result of test */ - boolean canExternalize( User user, Class klass ); + boolean canMakeExternal( User user, Class klass ); /** * Is the default for this type to be private? diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java index 6dcc7ace..a690c3dd 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java +++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java @@ -28,16 +28,18 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.github.benmanes.caffeine.cache.Caffeine; +import com.github.benmanes.caffeine.cache.LoadingCache; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hisp.dhis.i18n.locale.LocaleManager; -import org.hisp.dhis.security.acl.AclService; import org.hisp.dhis.common.CodeGenerator; import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.i18n.I18n; import org.hisp.dhis.i18n.I18nManager; +import org.hisp.dhis.i18n.locale.LocaleManager; import org.hisp.dhis.message.MessageSender; import org.hisp.dhis.period.Cal; +import org.hisp.dhis.security.acl.AclService; import org.hisp.dhis.setting.SettingKey; import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.system.util.ValidationUtils; @@ -52,9 +54,6 @@ import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Autowired; -import com.github.benmanes.caffeine.cache.Caffeine; -import com.github.benmanes.caffeine.cache.LoadingCache; - import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -87,7 +86,7 @@ public class DefaultSecurityService private final LoadingCache CACHE_USERNAME_FAILED_LOGIN_ATTEMPTS = Caffeine.newBuilder() .expireAfterWrite( LOGIN_LOCKOUT_MINS, TimeUnit.MINUTES ) .build( ( u ) -> 0 ); - + // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- @@ -147,11 +146,11 @@ public void registerFailedLogin( String username ) { return; } - + Integer attempts = CACHE_USERNAME_FAILED_LOGIN_ATTEMPTS.get( username ); - + attempts++; - + CACHE_USERNAME_FAILED_LOGIN_ATTEMPTS.put( username, attempts ); } @@ -162,8 +161,8 @@ public void registerSuccessfulLogin( String username ) { return; } - - CACHE_USERNAME_FAILED_LOGIN_ATTEMPTS.invalidate( username ); + + CACHE_USERNAME_FAILED_LOGIN_ATTEMPTS.invalidate( username ); } @Override @@ -173,15 +172,15 @@ public boolean isLocked( String username ) { return false; } - + return CACHE_USERNAME_FAILED_LOGIN_ATTEMPTS.get( username ) > LOGIN_MAX_FAILED_ATTEMPTS; } - + private boolean isBlockFailedLogins() { return (Boolean) systemSettingManager.getSystemSetting( SettingKey.LOCK_MULTIPLE_FAILED_LOGINS ); } - + @Override public boolean prepareUserForInvite( User user ) { @@ -526,7 +525,7 @@ public boolean isInviteUsername( String username ) public boolean canCreatePublic( IdentifiableObject identifiableObject ) { return !aclService.isShareable( identifiableObject.getClass() ) - || aclService.canCreatePublic( currentUserService.getCurrentUser(), identifiableObject.getClass() ); + || aclService.canMakePublic( currentUserService.getCurrentUser(), identifiableObject.getClass() ); } @Override @@ -535,14 +534,14 @@ public boolean canCreatePublic( String type ) Class klass = aclService.classForType( type ); return !aclService.isShareable( klass ) - || aclService.canCreatePublic( currentUserService.getCurrentUser(), klass ); + || aclService.canMakePublic( currentUserService.getCurrentUser(), klass ); } @Override public boolean canCreatePrivate( IdentifiableObject identifiableObject ) { return !aclService.isShareable( identifiableObject.getClass() ) - || aclService.canCreatePrivate( currentUserService.getCurrentUser(), identifiableObject.getClass() ); + || aclService.canMakePrivate( currentUserService.getCurrentUser(), identifiableObject.getClass() ); } @Override @@ -559,7 +558,7 @@ public boolean canCreatePrivate( String type ) Class klass = aclService.classForType( type ); return !aclService.isShareable( klass ) - || aclService.canCreatePrivate( currentUserService.getCurrentUser(), klass ); + || aclService.canMakePrivate( currentUserService.getCurrentUser(), klass ); } @Override @@ -601,11 +600,11 @@ public boolean canManage( IdentifiableObject identifiableObject ) public boolean hasAnyAuthority( String... authorities ) { User user = currentUserService.getCurrentUser(); - + if ( user != null && user.getUserCredentials() != null ) { UserCredentials userCredentials = user.getUserCredentials(); - + for ( String authority : authorities ) { if ( userCredentials.isAuthorized( authority ) ) diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/acl/DefaultAclService.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/acl/DefaultAclService.java index 579d613a..df1399fa 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/acl/DefaultAclService.java +++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/acl/DefaultAclService.java @@ -1,7 +1,7 @@ package org.hisp.dhis.security.acl; /* - * Copyright (c) 2004-2016, University of Oslo + * Copyright (c) 2004-2017, University of Oslo * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -103,9 +103,9 @@ public boolean canWrite( User user, IdentifiableObject object ) } if ( haveOverrideAuthority( user ) - || (object.getUser() == null && canCreatePublic( user, object.getClass() ) && !schema.getAuthorityByType( AuthorityType.CREATE_PRIVATE ).isEmpty()) + || (object.getUser() == null && canMakePublic( user, object.getClass() ) && !schema.getAuthorityByType( AuthorityType.CREATE_PRIVATE ).isEmpty()) || (user != null && object.getUser() != null && user.getUid().equals( object.getUser().getUid() )) - || ((object instanceof User) && canCreatePrivate( user, object.getClass() )) + || ((object instanceof User) && canMakePrivate( user, object.getClass() )) || AccessStringHelper.canWrite( object.getPublicAccess() ) ) { return true; @@ -226,7 +226,7 @@ public boolean canManage( User user, IdentifiableObject object ) if ( haveOverrideAuthority( user ) || user.equals( object.getUser() ) - || (object.getUser() == null && canCreatePublic( user, object.getClass() ) && !schema.getAuthorityByType( AuthorityType.CREATE_PRIVATE ).isEmpty()) + || (object.getUser() == null && canMakePublic( user, object.getClass() ) && !schema.getAuthorityByType( AuthorityType.CREATE_PRIVATE ).isEmpty()) || AccessStringHelper.canWrite( object.getPublicAccess() ) ) { return true; @@ -269,11 +269,11 @@ public boolean canCreate( User user, Class kla return canAccess( user, schema.getAuthorityByType( AuthorityType.CREATE ) ); } - return canCreatePublic( user, klass ) || canCreatePrivate( user, klass ); + return canMakePublic( user, klass ) || canMakePrivate( user, klass ); } @Override - public boolean canCreatePublic( User user, Class klass ) + public boolean canMakePublic( User user, Class klass ) { Schema schema = schemaService.getSchema( klass ); return !(schema == null || !schema.isShareable()) @@ -281,7 +281,7 @@ public boolean canCreatePublic( User user, Class< } @Override - public boolean canCreatePrivate( User user, Class klass ) + public boolean canMakePrivate( User user, Class klass ) { Schema schema = schemaService.getSchema( klass ); return !(schema == null || !schema.isShareable()) @@ -289,7 +289,7 @@ public boolean canCreatePrivate( User user, Class } @Override - public boolean canExternalize( User user, Class klass ) + public boolean canMakeExternal( User user, Class klass ) { Schema schema = schemaService.getSchema( klass ); return !(schema == null || !schema.isShareable()) @@ -350,7 +350,7 @@ public Access getAccess( T object, User user ) { Access access = new Access(); access.setManage( canManage( user, object ) ); - access.setExternalize( canExternalize( user, object.getClass() ) ); + access.setExternalize( canMakeExternal( user, object.getClass() ) ); access.setWrite( canWrite( user, object ) ); access.setRead( canRead( user, object ) ); access.setUpdate( canUpdate( user, object ) ); @@ -377,7 +377,7 @@ public void resetSharing( T object, User user ) baseIdentifiableObject.setUser( user ); } - if ( canCreatePublic( user, object.getClass() ) ) + if ( canMakePublic( user, object.getClass() ) ) { if ( defaultPublic( object.getClass() ) ) { @@ -404,9 +404,9 @@ public List verifySharing( T object, return errorReports; } - boolean canMakePublic = canCreatePublic( user, object.getClass() ); - boolean canMakePrivate = canCreatePrivate( user, object.getClass() ); - boolean canMakeExternal = canExternalize( user, object.getClass() ); + boolean canMakePublic = canMakePublic( user, object.getClass() ); + boolean canMakePrivate = canMakePrivate( user, object.getClass() ); + boolean canMakeExternal = canMakeExternal( user, object.getClass() ); if ( object.getExternalAccess() ) { diff --git a/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/security/acl/AclServiceTest.java b/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/security/acl/AclServiceTest.java index edbefd08..9b977710 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/security/acl/AclServiceTest.java +++ b/dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/security/acl/AclServiceTest.java @@ -50,9 +50,7 @@ import java.util.HashSet; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; /** * @author Morten Olav Hansen @@ -142,8 +140,8 @@ public void testCanCreatePrivatePublicDashboard() { User user = createAdminUser( "F_DATAELEMENT_PRIVATE_ADD" ); - assertFalse( aclService.canCreatePublic( user, Dashboard.class ) ); - assertTrue( aclService.canCreatePrivate( user, Dashboard.class ) ); + assertFalse( aclService.canMakePublic( user, Dashboard.class ) ); + assertTrue( aclService.canMakePrivate( user, Dashboard.class ) ); } @Test @@ -164,8 +162,8 @@ public void testCanCreatePrivatePublicChart() { User user = createAdminUser( "F_DATAELEMENT_PRIVATE_ADD" ); - assertFalse( aclService.canCreatePublic( user, Chart.class ) ); - assertTrue( aclService.canCreatePrivate( user, Chart.class ) ); + assertFalse( aclService.canMakePublic( user, Chart.class ) ); + assertTrue( aclService.canMakePrivate( user, Chart.class ) ); } @Test @@ -186,8 +184,8 @@ public void testCanCreatePrivatePublicMap() { User user = createAdminUser( "F_DATAELEMENT_PRIVATE_ADD" ); - assertFalse( aclService.canCreatePublic( user, Map.class ) ); - assertTrue( aclService.canCreatePrivate( user, Map.class ) ); + assertFalse( aclService.canMakePublic( user, Map.class ) ); + assertTrue( aclService.canMakePrivate( user, Map.class ) ); } @Test @@ -208,8 +206,8 @@ public void testCanCreatePrivatePublicReportTable() { User user = createAdminUser( "F_DATAELEMENT_PRIVATE_ADD" ); - assertFalse( aclService.canCreatePublic( user, ReportTable.class ) ); - assertTrue( aclService.canCreatePrivate( user, ReportTable.class ) ); + assertFalse( aclService.canMakePublic( user, ReportTable.class ) ); + assertTrue( aclService.canMakePrivate( user, ReportTable.class ) ); } @Test @@ -230,8 +228,8 @@ public void testCanCreatePrivatePublicEventChart() { User user = createAdminUser( "F_DATAELEMENT_PRIVATE_ADD" ); - assertFalse( aclService.canCreatePublic( user, EventChart.class ) ); - assertTrue( aclService.canCreatePrivate( user, EventChart.class ) ); + assertFalse( aclService.canMakePublic( user, EventChart.class ) ); + assertTrue( aclService.canMakePrivate( user, EventChart.class ) ); } @Test @@ -252,8 +250,8 @@ public void testCanCreatePrivatePublicEventReport() { User user = createAdminUser( "F_DATAELEMENT_PRIVATE_ADD" ); - assertFalse( aclService.canCreatePublic( user, EventReport.class ) ); - assertTrue( aclService.canCreatePrivate( user, EventReport.class ) ); + assertFalse( aclService.canMakePublic( user, EventReport.class ) ); + assertTrue( aclService.canMakePrivate( user, EventReport.class ) ); } @Test @@ -274,8 +272,8 @@ public void testCanCreatePrivatePublicLegendSet() { User user = createAdminUser( "F_LEGEND_SET_PRIVATE_ADD" ); - assertFalse( aclService.canCreatePublic( user, LegendSet.class ) ); - assertTrue( aclService.canCreatePrivate( user, LegendSet.class ) ); + assertFalse( aclService.canMakePublic( user, LegendSet.class ) ); + assertTrue( aclService.canMakePrivate( user, LegendSet.class ) ); } @Test diff --git a/dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java b/dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java index c1085135..e384a2c4 100644 --- a/dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java +++ b/dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java @@ -384,14 +384,14 @@ public int save( T object, User user, boolean clearSharing ) if ( clearSharing ) { - if ( aclService.canCreatePublic( user, identifiableObject.getClass() ) ) + if ( aclService.canMakePublic( user, identifiableObject.getClass() ) ) { if ( aclService.defaultPublic( identifiableObject.getClass() ) ) { identifiableObject.setPublicAccess( AccessStringHelper.READ_WRITE ); } } - else if ( aclService.canCreatePrivate( user, identifiableObject.getClass() ) ) + else if ( aclService.canMakePrivate( user, identifiableObject.getClass() ) ) { identifiableObject.setPublicAccess( AccessStringHelper.newInstance().build() ); } @@ -410,8 +410,8 @@ else if ( aclService.canCreatePrivate( user, identifiableObject.getClass() ) ) private boolean checkPublicAccess( User user, IdentifiableObject identifiableObject ) { - return aclService.canCreatePublic( user, identifiableObject.getClass() ) || - (aclService.canCreatePrivate( user, identifiableObject.getClass() ) && + return aclService.canMakePublic( user, identifiableObject.getClass() ) || + (aclService.canMakePrivate( user, identifiableObject.getClass() ) && !AccessStringHelper.canReadOrWrite( identifiableObject.getPublicAccess() )); } From e4136d73fc74d8014c1bde3d4c6e57797b5d8dfd Mon Sep 17 00:00:00 2001 From: Morten Olav Hansen Date: Fri, 21 Apr 2017 10:30:16 +0200 Subject: [PATCH 30/31] minor fix --- .../hisp/dhis/webapi/controller/SharingController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SharingController.java b/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SharingController.java index fbc26faf..f5be3417 100644 --- a/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SharingController.java +++ b/dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SharingController.java @@ -127,8 +127,8 @@ public void getSharing( @RequestParam String type, @RequestParam String id, Http Sharing sharing = new Sharing(); - sharing.getMeta().setAllowPublicAccess( aclService.canCreatePublic( user, object.getClass() ) ); - sharing.getMeta().setAllowExternalAccess( aclService.canExternalize( user, object.getClass() ) ); + sharing.getMeta().setAllowPublicAccess( aclService.canMakePublic( user, object.getClass() ) ); + sharing.getMeta().setAllowExternalAccess( aclService.canMakeExternal( user, object.getClass() ) ); sharing.getObject().setId( object.getUid() ); sharing.getObject().setName( object.getDisplayName() ); @@ -139,7 +139,7 @@ public void getSharing( @RequestParam String type, @RequestParam String id, Http { String access; - if ( aclService.canCreatePublic( user, klass ) ) + if ( aclService.canMakePublic( user, klass ) ) { access = AccessStringHelper.newInstance().enable( AccessStringHelper.Permission.READ ).enable( AccessStringHelper.Permission.WRITE ).build(); } @@ -212,7 +212,7 @@ public void setSharing( @RequestParam String type, @RequestParam String id, Http // Ignore externalAccess if user is not allowed to make objects external // --------------------------------------------------------------------- - if ( aclService.canExternalize( user, object.getClass() ) ) + if ( aclService.canMakeExternal( user, object.getClass() ) ) { object.setExternalAccess( sharing.getObject().hasExternalAccess() ); } @@ -221,7 +221,7 @@ public void setSharing( @RequestParam String type, @RequestParam String id, Http // Ignore publicAccess if user is not allowed to make objects public // --------------------------------------------------------------------- - if ( aclService.canCreatePublic( user, object.getClass() ) ) + if ( aclService.canMakePublic( user, object.getClass() ) ) { object.setPublicAccess( sharing.getObject().getPublicAccess() ); } From eb2c00dda55de83f0a765c6ee8907125e0865532 Mon Sep 17 00:00:00 2001 From: Morten Olav Hansen Date: Mon, 24 Apr 2017 10:42:41 +0200 Subject: [PATCH 31/31] Bugfixes for AclService.canUpdate(..) (#751) * update UGA to contain proper userGroup on dxf2 import * allow update if user has RW through UGA --- .../dhis/preheat/DefaultPreheatService.java | 34 +++++++++++++++++++ .../dhis/security/acl/DefaultAclService.java | 17 +++++++++- .../DefaultObjectBundleValidationService.java | 12 +------ 3 files changed, 51 insertions(+), 12 deletions(-) diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java index 14962237..b866e9b9 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java +++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java @@ -66,6 +66,7 @@ import org.hisp.dhis.user.CurrentUserService; import org.hisp.dhis.user.User; import org.hisp.dhis.user.UserCredentials; +import org.hisp.dhis.user.UserGroup; import org.hisp.dhis.validation.ValidationRule; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -254,6 +255,7 @@ else if ( PreheatMode.REFERENCE == params.getPreheatMode() ) } handleAttributes( params.getObjects(), preheat ); + handleSecurity( params.getObjects(), params.getPreheatIdentifier(), preheat ); periodStore.getAll().forEach( period -> preheat.getPeriodMap().put( period.getName(), period ) ); periodStore.getAllPeriodTypes().forEach( periodType -> preheat.getPeriodTypeMap().put( periodType.getName(), periodType ) ); @@ -318,6 +320,38 @@ private void handleAttributes( Map, List, List> objects, PreheatIdentifier identifier, Preheat preheat ) + { + objects.forEach( ( klass, list ) -> list.forEach( object -> + { + object.getUserGroupAccesses().forEach( uga -> + { + UserGroup userGroup = null; + + if ( uga.getUserGroup() != null ) + { + if ( PreheatIdentifier.UID == identifier ) + { + userGroup = preheat.get( identifier, UserGroup.class, uga.getUserGroup().getUid() ); + } + else if ( PreheatIdentifier.CODE == identifier ) + { + userGroup = preheat.get( identifier, UserGroup.class, uga.getUserGroup().getCode() ); + } + } + else + { + userGroup = preheat.get( PreheatIdentifier.UID, UserGroup.class, uga.getUserGroupUid() ); + } + + if ( userGroup != null ) + { + uga.setUserGroup( userGroup ); + } + } ); + } ) ); + } + private void handleUniqueAttributeValues( Class klass, List objects, Preheat preheat ) { if ( objects.isEmpty() ) diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/acl/DefaultAclService.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/acl/DefaultAclService.java index df1399fa..bf3f6c68 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/acl/DefaultAclService.java +++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/acl/DefaultAclService.java @@ -418,7 +418,7 @@ public List verifySharing( T object, if ( AccessStringHelper.DEFAULT.equals( object.getPublicAccess() ) ) { - if ( canMakePublic || canMakePrivate ) + if ( canMakePublic || canMakePrivate || sharingCanWrite( object, user ) ) { return errorReports; } @@ -438,6 +438,21 @@ public List verifySharing( T object, return errorReports; } + private boolean sharingCanWrite( T object, User user ) + { + for ( UserGroupAccess userGroupAccess : object.getUserGroupAccesses() ) + { + /* Is the user allowed to read this object through group access? */ + if ( AccessStringHelper.canWrite( userGroupAccess.getAccess() ) + && userGroupAccess.getUserGroup().getMembers().contains( user ) ) + { + return true; + } + } + + return false; + } + private boolean userCheck( User user, IdentifiableObject object ) { if ( user == null || object.getUser() == null ) diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/objectbundle/DefaultObjectBundleValidationService.java b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/objectbundle/DefaultObjectBundleValidationService.java index 01437ba0..7ba4c139 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/objectbundle/DefaultObjectBundleValidationService.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/objectbundle/DefaultObjectBundleValidationService.java @@ -214,17 +214,7 @@ else if ( bundle.getImportMode().isDelete() ) private void handleDefaults( List objects ) { - Iterator iterator = objects.iterator(); - - while ( iterator.hasNext() ) - { - IdentifiableObject object = iterator.next(); - - if ( Preheat.isDefault( object ) ) - { - iterator.remove(); - } - } + objects.removeIf( Preheat::isDefault ); } private void validateAtomicity( ObjectBundle bundle, ObjectBundleValidationReport validation )