dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9853
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-02-20 17:33:38 +0700
message:
  Add missing images.
added:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonAggregateReport.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonAggregateReportResult.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/assign_b-denied.png
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/images/programstage-denied.png
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/images/userrole-defined.png


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonAggregateReport.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonAggregateReport.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonAggregateReport.vm	2013-02-20 10:33:38 +0000
@@ -0,0 +1,36 @@
+
+#set( $noRows = $grid.getRows().size() )
+{
+#set( $noHeader = $grid.getHeaders().size() )
+#set( $metaData = $noHeader - $valueTypes.size() )
+"message": "$!message",
+"total": "$total",
+"totalRecords": "$totalRecords",
+"title": "$!encoder.jsonEncode(${grid.subtitle})",
+"columns":[
+  #set($index = 0)
+  #foreach( $col in $grid.getHeaders() )
+  {
+    #set( $mapIndx = $index - $metaData  )
+    "xtype": #if( $mapSuggestedValues.get($mapIndx) && $index > $metaData && $mapSuggestedValues.get($mapIndx).size() > 0 )"combobox"#else"textfield"#end,
+    "suggested": [#set( $suggestedValues = $mapSuggestedValues.get($mapIndx) )
+    #foreach( $suggestedValue in $suggestedValues )
+    ["$!encoder.jsonEncode( ${suggestedValue} )"]
+	#if( $velocityCount < $suggestedValues.size() ),#end
+    #end],
+    "name": "$!encoder.jsonEncode($!col.name)",
+    "hidden": "$!col.hidden"
+  }#if( $velocityCount < $noHeader ),#end
+  #set($index = $index + 1)
+  #end
+],
+"items":[
+  #foreach( $row in $grid.getRows() )
+  [
+  #foreach( $col in $row )
+  "$!encoder.jsonEncode($!col)"#if( $velocityCount < $noHeader ),#end
+  #end
+  ]#if( $velocityCount < $noRows ),#end
+  #end
+ ]
+}
\ No newline at end of file

=== added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonAggregateReportResult.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonAggregateReportResult.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonAggregateReportResult.vm	2013-02-20 10:33:38 +0000
@@ -0,0 +1,23 @@
+#set( $noRows = $grid.getRows().size() )
+{
+"message": "$!message",
+"title": "$!encoder.jsonEncode(${grid.subtitle})",
+#set( $noHeader = $grid.getHeaders().size() )
+"columns":[
+  #foreach( $col in $grid.getHeaders() )
+  {
+    "name": "$!encoder.jsonEncode($!col.name)",
+    "hidden": "$!col.hidden"
+  }#if( $velocityCount < $noHeader ),#end
+  #end
+],
+"items":[
+  #foreach( $row in $grid.getRows() )
+  [
+  #foreach( $col in $row )
+	"$!col"#if( $velocityCount < $noHeader ),#end
+  #end
+  ]#if( $velocityCount < $noRows ),#end
+  #end
+ ]
+}
\ No newline at end of file

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/assign_b-denied.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/assign_b-denied.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/assign_b-denied.png	2013-02-20 10:33:38 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/images/programstage-denied.png'
Binary files dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/images/programstage-denied.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/images/programstage-denied.png	2013-02-20 10:33:38 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/images/userrole-defined.png'
Binary files dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/images/userrole-defined.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/images/userrole-defined.png	2013-02-20 10:33:38 +0000 differ